]> 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>
Mon, 6 Jan 2014 06:07:56 +0000 (17:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 06:07:56 +0000 (17:07 +1100)
commitdbc796b73647a58f8386aeb8ae1674a695abdaa4
tree5884d585c77ec0a22da8e4e82c34015ee46133e9
parentc93d9862765c0b0564dae7a2abdc1ad3bac70f40
parent3b1e77ef973fa524fe3c2de06e9401ce8a6f18cd
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