commit | 6cb8a911745616eee0bdd97a2e82eb9723e9599a | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 12 09:43:44 2009 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 12 09:43:44 2009 -0700 |
tree | f5a95d10443653009ee0db290657b938c5215695 | |
parent | 7f3591cfacf2d79c4f42238e46c7d053da8e020d [diff] | |
parent | 3ea400581f2b595afd91207bbd79c11cb38598e0 [diff] |
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: Remove lock_kernel from gfs2_put_super() GFS2: Add tracepoints