diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-18 15:46:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-18 15:46:21 -0800 |
| commit | 9960c90c0cb9652f69ce794c7bf99bb3acf23552 (patch) | |
| tree | 2386f361fcaa96bebb724e2436148f086fac1803 /include/linux | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus (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
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions