]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ceph/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Nov 2012 23:26:51 +0000 (10:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Nov 2012 23:26:51 +0000 (10:26 +1100)
1  2 
net/ceph/messenger.c

Simple merge