From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 29 Jul 2006 02:24:16 +0000 (-0700)
Subject: Merge git://oss.sgi.com:8090/nathans/xfs-rc-2.6
X-Git-Tag: v2.6.18-rc3~25
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=159099dc3d501f8a39a169125c476f9b25182610;p=linux-2.6-omap-h63xx.git

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

* git://oss.sgi.com:8090/nathans/xfs-rc-2.6:
  [XFS] Ensure bulkstat from an invalid inode number gets caught always with
  [XFS] Fix a barrier related forced shutdown on mounts with quota enabled.
  [XFS] Fix remount vs no/barrier options by ensuring we clear unwanted
  [XFS] All xfs_disk_dquot_t values are (as the name says) disk endian.
---

159099dc3d501f8a39a169125c476f9b25182610