From: Linus Torvalds Date: Thu, 10 Apr 2008 20:39:29 +0000 (-0700) Subject: Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5d69a029ab13ddef5bdad69174fabafada4a87fd;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 * 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: [XFS] Ensure "both" features2 slots are consistent [XFS] Fix superblock features2 field alignment problem [XFS] remove shouting-indirection macros from xfs_sb.h --- 5d69a029ab13ddef5bdad69174fabafada4a87fd