projects
/
profile
/
common
/
kernel-common.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
47ce56e
7114b0b
)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
author
Linus Torvalds
<torvalds@g5.osdl.org>
Tue, 30 May 2006 18:31:10 +0000
(11:31 -0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Tue, 30 May 2006 18:31:10 +0000
(11:31 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NETFILTER]: PPTP helper: fix sstate/cstate typo
[NETFILTER]: mark H.323 helper experimental
[NETFILTER]: Fix small information leak in SO_ORIGINAL_DST (CVE-2006-1343)
Trivial merge
projects / profile / common / kernel-common.git / commitdiff