]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ext4/dev'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:33:09 +0000 (14:33 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:33:09 +0000 (14:33 +0200)
1  2 
fs/ext4/ext4.h
fs/ext4/inode.c

diff --cc fs/ext4/ext4.h
Simple merge
diff --cc fs/ext4/inode.c
Simple merge