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)
commitab5c5f639bba89d1103deae447836edf41e37659
treef7e619c425975e0a022ba2ff2449bf2ce8b6cca4
parentc5e0c7825d3a14c2dfc383763393f0bcb5400aa6
parentc8891329131f791e0ddc422eaf6fc86e9a8cf8f5
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()
MAINTAINERS