Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Oct 2010 20:45:26 +0000 (13:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Oct 2010 20:45:26 +0000 (13:45 -0700)
commit5710c2b275b3c0434f0de8f4ce6721aaf4c2a100
treec74ef21827e0ce239681144e103f0d8f4f13a9ce
parenta4099ae79d04ecf31bd0fc5aa4c1472b6fa7993a
parent081003fff467ea0e727f66d5d435b4f473a789b3
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: properly account for reclaimed inodes