]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ceph/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 01:36:36 +0000 (11:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 01:36:36 +0000 (11:36 +1000)
commitc4c6f9923183d01c0da6fc53bcf86224de444465
tree67b217a43c1b93fb3064be7f070225e7ab14e974
parenta3e23fa33c42463f8f74f0e1aaa6304b56cb9521
parent388cfdc9bc19cc189b86770dba55910018e8e0fc
Merge remote-tracking branch 'ceph/master'

Conflicts:
fs/ceph/inode.c
fs/ceph/snap.c
fs/ceph/super.c
fs/ceph/super.h
include/linux/ceph/libceph.h
net/ceph/auth_x.c
net/ceph/ceph_common.c