]> git.baikalelectronics.ru Git - kernel.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)
commitb909287e33db9c29e0ce6ab1ab5846399ad7e676
tree1123225102bc850b09cfb5ba1ccff47f4ef3e044
parent63750a4ac6bf778451f09cb0accdd225c7468d38
parenta06370e03ec99ec54b7f1e99b9530374ec08a43f
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