Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
commit9960c90c0cb9652f69ce794c7bf99bb3acf23552
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 18 Feb 2008 23:46:21 +0000 (18 15:46 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 18 Feb 2008 23:46:21 +0000 (18 15:46 -0800)
tree2386f361fcaa96bebb724e2436148f086fac1803
parent0eddf038adc8dff78efe86b71284e3f52b7cef27
parentc58310bf4933986513020fa90b4190c7492995ae
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] Added quota targets and removed dmapi directory
  [XFS] Fix up xfs out-of-tree builds. (a.k.a. external modules)
  [XFS] Remove Makefile wrappers in XFS