Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
Linus Torvalds [Thu, 18 Mar 2010 23:46:05 +0000 (16:46 -0700)]
* '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


Trivial merge