]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 20:38:37 +0000 (13:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 20:38:37 +0000 (13:38 -0700)
commitac7ac9f2b9bfd9b68a1571d27e4c8bebb4788914
tree02aa160e02f7f1f4a65a7f478e9a92c0b7ad0088
parentac89a9174decf343de049a06fad75681f71890eb
parent8379e7c46cc48f51197dd663fc6676f47f2a1e71
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  ocfs2: ocfs2_write_begin_nolock() should handle len=0
  ocfs2: invalidate dentry if its dentry_lock isn't initialized.