Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Jun 2009 16:43:44 +0000 (09:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Jun 2009 16:43:44 +0000 (09:43 -0700)
commit6cb8a911745616eee0bdd97a2e82eb9723e9599a
treef5a95d10443653009ee0db290657b938c5215695
parent7f3591cfacf2d79c4f42238e46c7d053da8e020d
parent3ea400581f2b595afd91207bbd79c11cb38598e0
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: Remove lock_kernel from gfs2_put_super()
  GFS2: Add tracepoints