diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-19 08:21:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-19 08:21:13 -0700 |
| commit | 309d4b000b0c427dafece9111682dd15fbaae6a6 (patch) | |
| tree | 51d3878c3c285009e9c83ae5e6e660910ee78e51 /net/bluetooth | |
| parent | 61c901c56905256a4a4d7c2af92d66200a2ee7f2 (diff) | |
| parent | 734b65417b24d6eea3e3d7457e1f11493890ee1d (diff) | |
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/bluetooth')
0 files changed, 0 insertions, 0 deletions