]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ceph/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 24 Jul 2012 23:47:16 +0000 (09:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 24 Jul 2012 23:47:16 +0000 (09:47 +1000)
commitf8d1146a4120c56cbae5e2a8e3596a0657aabb9a
treea707dc9b3a8849a1e58b2bc822ade8460c4edc5a
parent0e3df4912e2767813a68fbb61fc73360a5f78798
parent26ce171915f348abd1f41da1ed139d93750d987f
Merge remote-tracking branch 'ceph/master'

Conflicts:
net/ceph/messenger.c
net/ceph/osd_client.c
include/linux/ceph/messenger.h
net/ceph/messenger.c