From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 10 Aug 2006 06:57:52 +0000 (-0700)
Subject: Merge git://oss.sgi.com:8090/nathans/xfs-rc-2.6
X-Git-Tag: v2.6.18-rc5~117
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=99baa75231e35aca41b9718adfb07f45ce40e84c;p=powerpc.git

Merge git://oss.sgi.com:8090/nathans/xfs-rc-2.6
---

99baa75231e35aca41b9718adfb07f45ce40e84c