Merge branch 'for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Oct 2009 19:12:49 +0000 (12:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Oct 2009 19:12:49 +0000 (12:12 -0700)
commita80a66caf8110fc33af8013353fe0da0ae553a13
tree35cf3ba9ccba371b2e2752cd5cbfc8c3a428f1ea
parentbf699c9bac124f0a095d8ef06f2d6b219300a822
parentc7ff91d722e44c98504e6e2c357b47e1988dfbbd
Merge branch 'for-linus' of git://git./fs/xfs/xfs

* 'for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs:
  xfs: fix xfs_quota remove error
  xfs: free temporary cursor in xfs_dialloc
fs/xfs/linux-2.6/xfs_quotaops.c