Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
commit620565ef5f35f4196e5081417db381c16b0ae791
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Feb 2009 21:09:32 +0000 (19 13:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Feb 2009 21:09:32 +0000 (19 13:09 -0800)
tree6bfbcd9c26de367a64177392e9eb0dc553094f36
parenta5e753638874b9caabde01c8774e1a39e31cb614
parent27e88bf6af7d42adf790f7b2ed7d65475f191cf2
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  Revert "[XFS] remove old vmap cache"
  Revert "[XFS] use scalable vmap API"