tree b836666993fac5c9a157c2cb756c33fb66cb13e8
parent 98e52c373cdc1239a9ec6a2763f519cc1d99dcbc
parent cb7a93412ab52361bc255cbe2c767e0741c09f43
author Linus Torvalds <torvalds@linux-foundation.org> 1283899468 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1283899468 -0700

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: Make fiemap work with sparse files
  xfs: prevent 32bit overflow in space reservation
  xfs: Disallow 32bit project quota id
  xfs: improve buffer cache hash scalability