summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-30 19:44:52 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-30 19:44:52 +0200
commit0e90ed0e8b9b1c25040442f1d20c799751b1e727 (patch)
treea2cc09243069d5c6533f138ef59473c800adb59c /include
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egt... (diff)
parentusbnet: Remove over-broad module alias from zaurus. (diff)
downloadlinux-0e90ed0e8b9b1c25040442f1d20c799751b1e727.tar.xz
linux-0e90ed0e8b9b1c25040442f1d20c799751b1e727.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (24 commits) usbnet: Remove over-broad module alias from zaurus. MAINTAINERS: drop Michael from bfin_mac driver net/can: activate bit-timing calculation and netlink based drivers by default rionet: fix NULL pointer dereference in rionet_remove net+crypto: Use vmalloc for zlib inflate buffers. netfilter: Fix ip_route_me_harder triggering ip_rt_bug ipv4: Fix IPsec slowpath fragmentation problem ipv4: Fix packet size calculation in __ip_append_data cxgb3: skb_record_rx_queue now records the queue index relative to the net_device. bridge: Only flood unregistered groups to routers qlge: Add maintainer. MAINTAINERS: mark socketcan-core lists as subscribers-only MAINTAINERS: Remove Sven Eckelmann from BATMAN ADVANCED r8169: fix wrong register use. net/usb/kalmia: signedness bug in kalmia_bind() net/usb: kalmia: Various fixes for better support of non-x86 architectures. rtl8192cu: Fix missing firmware load udp/recvmsg: Clear MSG_TRUNC flag when starting over for a new packet ipv6/udp: Use the correct variable to determine non-blocking condition netconsole: fix build when CONFIG_NETCONSOLE_DYNAMIC is turned on ...
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions