Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Sep 2010 22:44:28 +0000 (15:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Sep 2010 22:44:28 +0000 (15:44 -0700)
commitfa2925cf90e612cb9c10c45d0cb8a7c7332e56a7
treeb836666993fac5c9a157c2cb756c33fb66cb13e8
parent98e52c373cdc1239a9ec6a2763f519cc1d99dcbc
parentcb7a93412ab52361bc255cbe2c767e0741c09f43
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