summaryrefslogtreecommitdiff
path: root/include/asm-frv
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-10 13:39:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-10 13:39:29 -0700
commit5d69a029ab13ddef5bdad69174fabafada4a87fd (patch)
tree1123225102bc850b09cfb5ba1ccff47f4ef3e044 /include/asm-frv
parent999646e3f953c734f8eced551fc1ea28719ba7a7 (diff)
parente6957ea48429aeda4f5d51af4238231d44b0dc4a (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
Diffstat (limited to 'include/asm-frv')
0 files changed, 0 insertions, 0 deletions