Merge branch 'master' of git://git.kernel.org/pub/scm/linux/storage/multipath-tools/
authorHannes Reinecke <hare@suse.de>
Fri, 15 Apr 2011 12:01:25 +0000 (14:01 +0200)
committerHannes Reinecke <hare@suse.de>
Fri, 15 Apr 2011 12:01:25 +0000 (14:01 +0200)

Trivial merge