Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 21:25:14 +0000 (14:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 21:25:14 +0000 (14:25 -0700)
commit0edfa2b1b5a5e1475e76dd3c792447687d966de4
treea811a6955bb0fffc883e59eb261206b132e9e6dc
parent5a09adf13067609d8ab9fcae11dc99fd0084e35c
parent3725867dccfb83e4b0cff64e916a04258f300591
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: actually enable the swapext compat handler