]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ceph/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 00:45:59 +0000 (10:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 00:45:59 +0000 (10:45 +1000)
1  2 
drivers/block/rbd.c

Simple merge