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
This commit is contained in:
Linus Torvalds 2010-01-08 13:57:32 -08:00
commit dbd6a7cfea