]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/device-mapper'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 01:19:23 +0000 (12:19 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 01:19:23 +0000 (12:19 +1100)
commitb628f2da055a09afa7917905f2e5c99eb209b749
treec0358b68b285c5e26a1cf6b78f9aad5f89995876
parent41a0865e19f8b847bb1417bd29e57d05f2dd41c1
parent24d047be6c65a5a89bd9ab60d92d8dfe40389e7c
Merge branch 'quilt/device-mapper'

Conflicts:
drivers/md/dm-thin.c
drivers/md/dm.c
drivers/md/dm-mpath.c