From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Mar 2010 23:46:05 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v2.6.34-rc2~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=01d61d0d64065b591a3c1502d42b350b10764c54;p=profile%2Fivi%2Fkernel-x86-ivi.git

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
---

01d61d0d64065b591a3c1502d42b350b10764c54