Merge branch 'master' of git://git.kernel.org/pub/scm/linux/storage/multipath-tools/
authorHannes Reinecke <hare@suse.de>
Tue, 7 Sep 2010 08:42:10 +0000 (10:42 +0200)
committerHannes Reinecke <hare@suse.de>
Tue, 7 Sep 2010 08:42:10 +0000 (10:42 +0200)

Trivial merge