Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Nov 2011 11:05:17 +0000 (06:05 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Nov 2011 11:05:17 +0000 (06:05 -0500)
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  MAINTAINERS: update XFS maintainer entry
  xfs: use doalloc flag in xfs_qm_dqattach_one()

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge