From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 19 Nov 2011 11:05:17 +0000 (-0500)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: firefly_0821_release~3680^2~4080
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ab5c5f639bba89d1103deae447836edf41e37659;p=firefly-linux-kernel-4.4.55.git

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

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  MAINTAINERS: update XFS maintainer entry
  xfs: use doalloc flag in xfs_qm_dqattach_one()
---

ab5c5f639bba89d1103deae447836edf41e37659