tree 6bfbcd9c26de367a64177392e9eb0dc553094f36
parent a5e753638874b9caabde01c8774e1a39e31cb614
parent 27e88bf6af7d42adf790f7b2ed7d65475f191cf2
author Linus Torvalds <torvalds@linux-foundation.org> 1235077772 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235077772 -0800

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"