]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'device-mapper/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 03:17:03 +0000 (14:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 03:17:03 +0000 (14:17 +1100)
commita78f85a2b613104721bc804dd3bc2f5d57524972
tree6765072f08b88cb7049904fcd9bfc4b5a672a31b
parentc4452914c1bad786c10c477ed98168e6d022550e
parent1584dbbde46a588d04b3030941411ebf2fa34937
Merge remote-tracking branch 'device-mapper/for-next'

Conflicts:
drivers/md/dm-thin.c
drivers/md/dm-cache-policy-mq.c
drivers/md/dm-delay.c
drivers/md/dm-thin.c