]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'xfs-fixes-for-3.15-rc5' into for-next
authorDave Chinner <david@fromorbit.com>
Tue, 6 May 2014 00:02:13 +0000 (10:02 +1000)
committerDave Chinner <david@fromorbit.com>
Tue, 6 May 2014 00:02:13 +0000 (10:02 +1000)
1  2 
fs/xfs/xfs_attr_remote.c
fs/xfs/xfs_da_btree.h

Simple merge
Simple merge