diff options
author | 2006-05-30 11:31:10 -0700 | |
---|---|---|
committer | 2006-05-30 11:31:10 -0700 | |
commit | d1b3f96b0f9c1d9bc305a4d14bee0dc3509101a0 (patch) | |
tree | 663f12dd5895b62858d89f37036604d282532848 /arch/mips/kernel/proc.c | |
parent | Input: psmouse - DMI updates for lifebook protocol (diff) | |
parent | [NETFILTER]: PPTP helper: fix sstate/cstate typo (diff) | |
download | wireguard-linux-d1b3f96b0f9c1d9bc305a4d14bee0dc3509101a0.tar.xz wireguard-linux-d1b3f96b0f9c1d9bc305a4d14bee0dc3509101a0.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 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)
Diffstat (limited to 'arch/mips/kernel/proc.c')
0 files changed, 0 insertions, 0 deletions