tree 1123225102bc850b09cfb5ba1ccff47f4ef3e044
parent 999646e3f953c734f8eced551fc1ea28719ba7a7
parent e6957ea48429aeda4f5d51af4238231d44b0dc4a
author Linus Torvalds <torvalds@linux-foundation.org> 1207859969 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1207859969 -0700

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