]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ceph/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 00:24:32 +0000 (10:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 00:24:32 +0000 (10:24 +1000)
1  2 
fs/ceph/caps.c
fs/ceph/super.h
include/linux/ceph/libceph.h

diff --cc fs/ceph/caps.c
Simple merge
diff --cc fs/ceph/super.h
Simple merge
Simple merge