tree 1b08e3f745809d9c559e208a3a106a40cf11fdff
parent 23da64b4714812b66ecf010e7dfb3ed1bf2eda69
parent 1328df725239804ae30fc7257c1a3185e679b517
author Linus Torvalds <torvalds@linux-foundation.org> 1239811452 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239811452 -0700

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: Use DEFINE_SPINLOCK
  GFS2: cleanup file_operations mess
  GFS2: Move umount flush rwsem
  GFS2: Fix symlink creation race
  GFS2: Make quotad's waiting interruptible