diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 13:38:37 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 13:38:37 -0700 |
commit | ac7ac9f2b9bfd9b68a1571d27e4c8bebb4788914 (patch) | |
tree | 02aa160e02f7f1f4a65a7f478e9a92c0b7ad0088 /include/linux/if_ether.h | |
parent | ac89a9174decf343de049a06fad75681f71890eb (diff) | |
parent | 8379e7c46cc48f51197dd663fc6676f47f2a1e71 (diff) |
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.
Diffstat (limited to 'include/linux/if_ether.h')
0 files changed, 0 insertions, 0 deletions