]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/device-mapper'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 00:20:56 +0000 (11:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 00:20:56 +0000 (11:20 +1100)
commit870d86d43ced6a7e9f1ab29fa355fa61c73f86fc
tree2c89b24611c571c73a87c9390e7390a2bf099ee7
parent0b30562299a76494d9f5b8c396fd31ad7af0ae8e
parent24d047be6c65a5a89bd9ab60d92d8dfe40389e7c
Merge branch 'quilt/device-mapper'

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