Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jan 2010 21:57:32 +0000 (13:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jan 2010 21:57:32 +0000 (13:57 -0800)
commitdbd6a7cfead4fa2d7ad3fefe47168fcb146ac5ba
tree826ac108e6da2b23edbd6dcd9dc126a2ccbbf1c9
parentd86527ddcab4684d1a051b5f35f023b4374b1271
parenta539bd8c86549b545b4ed27a0cfaf53fe649054d
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: kill some warnings on i386 builds