Merge branch 'xfs-rt-fixes-4.6' into for-next
authorDave Chinner <david@fromorbit.com>
Sun, 6 Mar 2016 22:29:04 +0000 (09:29 +1100)
committerDave Chinner <david@fromorbit.com>
Sun, 6 Mar 2016 22:29:04 +0000 (09:29 +1100)
1  2 
fs/xfs/xfs_log_recover.c

Simple merge