tree 7cdb7fbc95b51b288e923a3978e17ed2207a4118
parent e90e4d9234c953b29267cc4fc9ad804128773313
parent 6a99be5d7b5973767b1ffa4fa68fed0738589c99
author Linus Torvalds <torvalds@linux-foundation.org> 1274452155 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1274452155 -0700

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