From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 May 2011 15:24:09 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=34b064569eba3bec65bf98efe057b0578fe13297;p=linux-beck.git

Merge git://git.kernel.org/pub/scm/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
---

34b064569eba3bec65bf98efe057b0578fe13297