]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'device-mapper/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Mar 2016 01:26:08 +0000 (12:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Mar 2016 01:26:08 +0000 (12:26 +1100)
1  2 
block/blk-core.c
drivers/md/dm-crypt.c

Simple merge
Simple merge