]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ceph/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 23:57:18 +0000 (10:57 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 23:57:18 +0000 (10:57 +1100)
1  2 
net/ceph/messenger.c

Simple merge