projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ac89a91
8379e7c
)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 5 Sep 2009 20:38:37 +0000
(13:38 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 5 Sep 2009 20:38:37 +0000
(13:38 -0700)
* '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.
Trivial merge