Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Apr 2010 02:49:34 +0000 (19:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Apr 2010 02:49:34 +0000 (19:49 -0700)
commite97e7120eb24800cf8eb62c7da07b161cc2a8c73
treeb48bf7a1f1e8192c5e3cb4e1289adc7a378c2d8d
parentfed0a9c644c7872f5bcaeb87a71103aef8e96761
parent9bf729c0af67897ea8498ce17c29b0683f7f2028
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: add a shrinker to background inode reclaim