diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-10 22:39:29 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-10 22:39:29 +0200 |
commit | 5d69a029ab13ddef5bdad69174fabafada4a87fd (patch) | |
tree | 1123225102bc850b09cfb5ba1ccff47f4ef3e044 /include/asm-frv | |
parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
parent | [XFS] Ensure "both" features2 slots are consistent (diff) | |
download | linux-5d69a029ab13ddef5bdad69174fabafada4a87fd.tar.xz linux-5d69a029ab13ddef5bdad69174fabafada4a87fd.zip |
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
Diffstat (limited to 'include/asm-frv')
0 files changed, 0 insertions, 0 deletions