diff options
| author | Linus Torvalds | 2012-07-19 17:21:13 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2012-07-19 17:21:13 +0200 |
| commit | 309d4b000b0c427dafece9111682dd15fbaae6a6 (patch) | |
| tree | 51d3878c3c285009e9c83ae5e6e660910ee78e51 /net/caif | |
| parent | Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | net: Statically initialize init_net.dev_base_head (diff) | |
| download | kernel-qcow2-linux-309d4b000b0c427dafece9111682dd15fbaae6a6.tar.gz kernel-qcow2-linux-309d4b000b0c427dafece9111682dd15fbaae6a6.tar.xz kernel-qcow2-linux-309d4b000b0c427dafece9111682dd15fbaae6a6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking changes from David Miller:
"Ok, we should be good to go now"
1) We have to statically initialize the init_net device list head rather
than do so in an initcall, otherwise netprio_cgroup crashes if it's
built statically rather than modular (Mark D. Rustad)
2) Fix SKB null oopser in CIPSO ipv4 option processing (Paul Moore)
3) Qlogic maintainers update (Anirban Chakraborty)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
net: Statically initialize init_net.dev_base_head
MAINTAINERS: Changes in qlcnic and qlge maintainers list
cipso: don't follow a NULL pointer when setsockopt() is called
Diffstat (limited to 'net/caif')
0 files changed, 0 insertions, 0 deletions