From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 17 Jan 2006 04:26:19 +0000 (-0800)
Subject: Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9bd5674c4aa3d430d61a578eaecd85104176f150;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

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

9bd5674c4aa3d430d61a578eaecd85104176f150