summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-14 19:55:25 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-14 19:55:25 -0800
commit5bf431fa32c52e7027c4af85c7afc82326fa6d43 (patch)
tree4d8f893bb5a5e74e5e8b3f711d68c531bec747fa /arch/cris
parentc2919f2ab9a2bb961e97c61bcf94f81d2c7e9feb (diff)
parentcb7a97d01521797cad9f63e8478403c3e51fea49 (diff)
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs: [XFS] Update maintainers [XFS] use scalable vmap API [XFS] remove old vmap cache [XFS] make xfs_ino_t an unsigned long long [XFS] truncate readdir offsets to signed 32 bit values [XFS] fix compile of xfs_btree_readahead_lblock on m68k [XFS] Remove macro-to-function indirections in the mask code [XFS] Remove macro-to-function indirections in attr code [XFS] Remove several unused typedefs. [XFS] pass XFS_IGET_BULKSTAT to xfs_iget for handle operations
Diffstat (limited to 'arch/cris')
0 files changed, 0 insertions, 0 deletions