]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'asm-generic/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 1 Nov 2015 22:09:15 +0000 (09:09 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 1 Nov 2015 22:09:15 +0000 (09:09 +1100)
1  2 
drivers/block/nvme-core.c

Simple merge