Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 May 2011 15:24:09 +0000 (08:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 May 2011 15:24:09 +0000 (08:24 -0700)
commit34b064569eba3bec65bf98efe057b0578fe13297
treecee99fb8035843776ec44ec5113fb586b2b6172b
parent2e77defc5da779888f3cf65e66cd3d47ae2d690f
parent26b06a6958df0f12f1a654db8598433eb89cc024
Merge git://git./linux/kernel/git/steve/gfs2-2.6-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: Wait properly when flushing the ail list
  GFS2: Wipe directory hash table metadata when deallocating a directory