From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Feb 2012 23:38:57 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=bb4c7e9a9908548b458f34afb2fee74dc0d49f90;p=linux-edison.git

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

A fix from Jesper Juhl removes an assignment in an ASSERT when a compare
is intended.  Two fixes from Mitsuo Hayasaka address off-by-ones in XFS
quota enforcement.

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: make inode quota check more general
  xfs: change available ranges of softlimit and hardlimit in quota check
  XFS: xfs_trans_add_item() - don't assign in ASSERT() when compare is intended
---

bb4c7e9a9908548b458f34afb2fee74dc0d49f90