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-Tag: v2.6.25-rc9~28 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5d69a029ab13ddef5bdad69174fabafada4a87fd;p=linux-2.6-omap-h63xx.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