]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ext4/dev'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:29:34 +0000 (11:29 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:29:34 +0000 (11:29 +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