From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 May 2010 14:29:15 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=677abe49ad017679627af9d3bbd9a7ecb3d94c42;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge git://git./linux/kernel/git/steve/gfs2-2.6-nmw

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
  GFS2: Fix typo
  GFS2: stuck in inode wait, no glocks stuck
  GFS2: Eliminate useless err variable
  GFS2: Fix writing to non-page aligned gfs2_quota structures
  GFS2: Add some useful messages
  GFS2: fix quota state reporting
  GFS2: Various gfs2_logd improvements
  GFS2: glock livelock
  GFS2: Clean up stuffed file copying
  GFS2: docs update
  GFS2: Remove space from slab cache name
---

677abe49ad017679627af9d3bbd9a7ecb3d94c42