]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ceph/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 00:32:26 +0000 (10:32 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 00:32:26 +0000 (10:32 +1000)
1  2 
fs/ceph/dir.c
fs/ceph/inode.c

diff --cc fs/ceph/dir.c
Simple merge
diff --cc fs/ceph/inode.c
Simple merge