]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3e23fa 388cfdc)
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)
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


Trivial merge
Linux kernel for KaRo TX COM modules