From: Linus Torvalds Date: Fri, 12 Jun 2009 16:43:44 +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=6cb8a911745616eee0bdd97a2e82eb9723e9599a;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.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: Remove lock_kernel from gfs2_put_super() GFS2: Add tracepoints --- 6cb8a911745616eee0bdd97a2e82eb9723e9599a