]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/device-mapper'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 01:14:51 +0000 (12:14 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 01:14:51 +0000 (12:14 +1100)
commita79c62355db383d74a3889c699a1c4d9105577cd
tree8f203833ac111b3101acc2862f27b1e488b3ee22
parent241fe880c3bbbacb6464f6afcfd763de571112c3
parent24d047be6c65a5a89bd9ab60d92d8dfe40389e7c
Merge branch 'quilt/device-mapper'

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