You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 28f3d71761 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Pull more networking updates from David Miller: "Ok, everything from here on out will be bug fixes." 1) One final sync of wireless and bluetooth stuff from John Linville. These changes have all been in his tree for more than a week, and therefore have had the necessary -next exposure. John was just away on a trip and didn't have a change to send the pull request until a day or two ago. 2) Put back some defines in user exposed header file areas that were removed during the tokenring purge. From Stephen Hemminger and Paul Gortmaker. 3) A bug fix for UDP hash table allocation got lost in the pile due to one of those "you got it.. no I've got it.." situations. :-) From Tim Bird. 4) SKB coalescing in TCP needs to have stricter checks, otherwise we'll try to coalesce overlapping frags and crash. Fix from Eric Dumazet. 5) RCU routing table lookups can race with free_fib_info(), causing crashes when we deref the device pointers in the route. Fix by releasing the net device in the RCU callback. From Yanmin Zhang. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (293 commits) tcp: take care of overlaps in tcp_try_coalesce() ipv4: fix the rcu race between free_fib_info and ip_route_output_slow mm: add a low limit to alloc_large_system_hash ipx: restore token ring define to include/linux/ipx.h if: restore token ring ARP type to header xen: do not disable netfront in dom0 phy/micrel: Fix ID of KSZ9021 mISDN: Add X-Tensions USB ISDN TA XC-525 gianfar:don't add FCB length to hard_header_len Bluetooth: Report proper error number in disconnection Bluetooth: Create flags for bt_sk() Bluetooth: report the right security level in getsockopt Bluetooth: Lock the L2CAP channel when sending Bluetooth: Restore locking semantics when looking up L2CAP channels Bluetooth: Fix a redundant and problematic incoming MTU check Bluetooth: Add support for Foxconn/Hon Hai AR5BBU22 0489:E03C Bluetooth: Fix EIR data generation for mgmt_device_found Bluetooth: Fix Inquiry with RSSI event mask Bluetooth: improve readability of l2cap_seq_list code Bluetooth: Fix skb length calculation ...		13 years ago
..
act2000	isdn: whitespace coding style cleanup	13 years ago
capi	isdn/capi: elliminate capincci_find() in non-middleware case	13 years ago
divert	isdn: whitespace coding style cleanup	13 years ago
gigaset	USB 3.5-rc1 pull request	13 years ago
hardware	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	13 years ago
hisax	USB: Disable hub-initiated LPM for comms devices.	13 years ago
hysdn	isdn/hysdn: Convert to kstrtoul_from_user	13 years ago
i4l	TTY pull request for 3.5-rc1	13 years ago
icn	isdn: whitespace coding style cleanup	13 years ago
isdnloop	isdn: whitespace coding style cleanup	13 years ago
mISDN	mISDN: Implement MISDN_CTRL_RX_OFF for more drivers	13 years ago
pcbit	Remove all #inclusions of asm/system.h	13 years ago
sc	isdn: whitespace coding style cleanup	13 years ago
Kconfig	um: switch to use of drivers/Kconfig	13 years ago
Makefile	…