summaryrefslogtreecommitdiff
path: root/fs/lockd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-12 20:43:44 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-12 20:43:44 +0400
commit6cb8a911745616eee0bdd97a2e82eb9723e9599a (patch)
treef5a95d10443653009ee0db290657b938c5215695 /fs/lockd
parent7f3591cfacf2d79c4f42238e46c7d053da8e020d (diff)
parent3ea400581f2b595afd91207bbd79c11cb38598e0 (diff)
downloadlinux-6cb8a911745616eee0bdd97a2e82eb9723e9599a.tar.xz
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
Diffstat (limited to 'fs/lockd')
0 files changed, 0 insertions, 0 deletions