Merge branch 'master' of git://git.kernel.org/pub/scm/linux/storage/multipath-tools/
authorHannes Reinecke <hare@suse.de>
Mon, 2 May 2011 10:03:21 +0000 (12:03 +0200)
committerHannes Reinecke <hare@suse.de>
Mon, 2 May 2011 10:03:21 +0000 (12:03 +0200)

Trivial merge