Merge branch 'master' of git://oss.sgi.com:8090/xfs/linux-2.6
authorNiv Sardi <xaiki@debian.org>
Fri, 7 Nov 2008 04:07:12 +0000 (15:07 +1100)
committerNiv Sardi <xaiki@debian.org>
Fri, 7 Nov 2008 04:07:12 +0000 (15:07 +1100)

Trivial merge