From: Linus Torvalds Date: Mon, 18 Feb 2008 23:46:21 +0000 (-0800) Subject: Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 X-Git-Tag: Ubuntu-5.0.0-8.9~35691 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9960c90c0cb9652f69ce794c7bf99bb3acf23552;p=mirror_ubuntu-disco-kernel.git 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 --- 9960c90c0cb9652f69ce794c7bf99bb3acf23552