commit | 9960c90c0cb9652f69ce794c7bf99bb3acf23552 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Feb 18 15:46:21 2008 -0800 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Feb 18 15:46:21 2008 -0800 |
tree | 2386f361fcaa96bebb724e2436148f086fac1803 | |
parent | 0eddf038adc8dff78efe86b71284e3f52b7cef27 [diff] | |
parent | c58310bf4933986513020fa90b4190c7492995ae [diff] |
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