| commit | 5d69a029ab13ddef5bdad69174fabafada4a87fd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 10 13:39:29 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 10 13:39:29 2008 -0700 |
| tree | 1123225102bc850b09cfb5ba1ccff47f4ef3e044 | |
| parent | 999646e3f953c734f8eced551fc1ea28719ba7a7 [diff] | |
| parent | e6957ea48429aeda4f5d51af4238231d44b0dc4a [diff] |
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