From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 19 Apr 2011 17:52:51 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f28c6179e5d8793bbeaceaef15fbbedcb2745f3b;p=openwrt%2Fstaging%2Fblogic.git

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: filesystem hang caused by incorrect lock order
  GFS2: Don't try to deallocate unlinked inodes when mounted ro
  GFS2: directly write blocks past i_size
  GFS2: write_end error path fails to unlock transaction lock
---

f28c6179e5d8793bbeaceaef15fbbedcb2745f3b