]> 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>
Wed, 8 Jan 2014 02:23:04 +0000 (13:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 02:23:04 +0000 (13:23 +1100)
commit0dd198738dc6109f8627aa3c52c04e65285477e5
treefde81dae53520a86b4d3fc0024562e85e536f240
parent6627a5d0f05837139f8b67f44665ba8759d9c235
parent681b170cb4cb7c0bac97388c7118f466bd6bffdd
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
drivers/md/dm.c