]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Apr 2008 20:39:29 +0000 (13:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Apr 2008 20:39:29 +0000 (13:39 -0700)
commit5d69a029ab13ddef5bdad69174fabafada4a87fd
tree1123225102bc850b09cfb5ba1ccff47f4ef3e044
parent999646e3f953c734f8eced551fc1ea28719ba7a7
parente6957ea48429aeda4f5d51af4238231d44b0dc4a
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