From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Oct 2013 21:47:22 +0000 (-0700)
Subject: Merge tag 'xfs-for-linus-v3.12-rc4' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: accepted/tizen/common/20141203.182822~1342
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3dbecf0aa9692cffbb71313a380c0ecc606c5920;p=platform%2Fkernel%2Flinux-arm64.git

Merge tag 'xfs-for-linus-v3.12-rc4' of git://oss.sgi.com/xfs/xfs

Pull xfs bugfixes from Ben Myers:
 "There are lockdep annotations for project quotas, a fix for dirent
  dtype support on v4 filesystems, a fix for a memory leak in recovery,
  and a fix for the build error that resulted from it.  D'oh"

* tag 'xfs-for-linus-v3.12-rc4' of git://oss.sgi.com/xfs/xfs:
  xfs: Use kmem_free() instead of free()
  xfs: fix memory leak in xlog_recover_add_to_trans
  xfs: dirent dtype presence is dependent on directory magic numbers
  xfs: lockdep needs to know about 3 dquot-deep nesting
---

3dbecf0aa9692cffbb71313a380c0ecc606c5920