Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Mar 2010 23:46:05 +0000 (16:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Mar 2010 23:46:05 +0000 (16:46 -0700)
commit01d61d0d64065b591a3c1502d42b350b10764c54
tree9fa05149e757d5208820afb446d962e2135f4798
parent2e0c17d100c35e843dac1e99daf19b5e2b3fe168
parente8c3753ce4cd6a805ebcfdb3aa6d30e6f4b8b3e0
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: don't warn about page discards on shutdown
  xfs: use scalable vmap API
  xfs: remove old vmap cache