Linus Torvalds 5d67767047 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: (22 commits) be2net: set proper value to version field in req hdr xfrm: Fix xfrm_state_clone leak ipcomp: Avoid duplicate calls to ipcomp_destroy ethtool: allow non-admin user to read GRO settings. ixgbe: fix WOL register setup for 82599 ixgbe: Fix - Do not allow Rx FC on 82598 at 1G due to errata sfc: Fix SFE4002 initialisation mac80211: fix handling of null-rate control in rate_control_get_rate inet: Remove bogus IGMPv3 report handling iwlwifi: fix AMSDU Rx after paged Rx patch tcp: fix ICMP-RTO war via-velocity: Fix races on shared interrupts via-velocity: Take spinlock on set coalesce via-velocity: Remove unused IRQ status parameter from rx_srv and tx_srv rtl8187: Add new device ID iwmc3200wifi: Test of wrong pointer after kzalloc in iwm_mlme_update_bss_table() ath9k: Fix sequence numbers for PAE frames mac80211: fix deferred hardware scan requests iwlwifi: Fix to set correct ht configuration mac80211: Fix probe request filtering in IBSS mode ...		2010-02-16 16:52:04 -08:00
..
9p	9p: fix p9_client_destroy unconditional calling v9fs_put_trans	2010-02-08 18:18:34 -06:00
802	sysctl net: Remove unused binary sysctl code	2009-11-12 02:05:06 -08:00
8021q	vlan: fix vlan_skb_recv()	2010-01-24 19:52:24 -08:00
appletalk	appletalk:: da.s_net not copied but assigned to itself in aarp_rcv()	2010-01-15 01:49:28 -08:00
atm	atm: [br2684] allow routed mode operation again	2009-12-08 20:22:31 -08:00
ax25	ax25: netrom: rose: Fix timer oopses	2010-01-16 01:04:04 -08:00
bluetooth	Bluetooth: Keep a copy of each HID device's report descriptor	2010-02-05 09:50:05 -08:00
bridge	netfilter: ebtables: enforce CAP_NET_ADMIN	2010-01-08 17:31:24 +01:00
can	net: Move && and || to end of previous line	2009-11-29 16:55:45 -08:00
core	ethtool: allow non-admin user to read GRO settings.	2010-02-16 14:53:23 -08:00
dcb	net: Move && and || to end of previous line	2009-11-29 16:55:45 -08:00
dccp	dccp: fix auto-loading of dccp(_probe)	2010-02-03 19:00:31 -08:00
decnet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
dsa	netdev: convert pseudo-devices to netdev_tx_t	2009-09-01 01:13:07 -07:00
econet	net: use net_eq to compare nets	2009-11-25 15:14:13 -08:00
ethernet	remove deprecated and not used: print_mac()	2009-11-15 22:21:34 -08:00
ieee802154	net: use net_eq to compare nets	2009-11-25 15:14:13 -08:00
ipv4	ipcomp: Avoid duplicate calls to ipcomp_destroy	2010-02-16 14:53:24 -08:00
ipv6	ipcomp: Avoid duplicate calls to ipcomp_destroy	2010-02-16 14:53:24 -08:00
ipx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
irda	irda: add missing BKL in irnet_ppp ioctl	2010-02-03 20:14:23 -08:00
iucv	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
key	af_key: fix netns ops ordering on module load/unload	2010-02-03 18:11:11 -08:00
lapb	net: remove NET_RX_BAD and NET_RX_CN* defines	2009-07-05 19:15:35 -07:00
llc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
mac80211	Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2010-02-14 11:56:38 -08:00
netfilter	netfilter: nf_conntrack: fix hash resizing with namespaces	2010-02-08 11:18:07 -08:00
netlabel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
netlink	netlink: fix for too early rmmod	2010-02-03 18:13:43 -08:00
netrom	ax25: netrom: rose: Fix timer oopses	2010-01-16 01:04:04 -08:00
packet	af_packet: Don't use skb after dev_queue_xmit()	2010-01-11 15:39:42 -08:00
phonet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
rds	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2009-12-16 10:32:31 -08:00
rfkill	net/rfkill/core.c: work around gcc-4.0.2 silliness	2009-12-07 16:51:23 -05:00
rose	ax25: netrom: rose: Fix timer oopses	2010-01-16 01:04:04 -08:00
rxrpc	net: use net_eq to compare nets	2009-11-25 15:14:13 -08:00
sched	net/sched: Fix module name in Kconfig	2010-02-08 22:41:44 -08:00
sctp	net/sctp/socket.c: squish warning	2010-01-03 21:25:53 -08:00
sunrpc	Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6	2010-01-08 13:55:14 -08:00
tipc	net: Move && and || to end of previous line	2009-11-29 16:55:45 -08:00
unix	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
wanrouter	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
wimax	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
wireless	cfg80211: fix channel setting for wext	2010-01-14 17:14:58 -05:00
x25	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
xfrm	xfrm: Fix xfrm_state_clone leak	2010-02-16 14:53:24 -08:00
compat.c	net: use compat helper functions in compat_sys_recvmmsg	2009-12-11 15:07:57 -08:00
Kconfig	net/compat/wext: send different messages to compat tasks	2009-07-15 08:53:39 -07:00
Makefile	net: remove redundant sched/ in net/Makefile	2009-07-12 20:11:14 -07:00
nonet.c
socket.c	fs: no games with DCACHE_UNHASHED	2009-12-17 10:51:40 -05:00
sysctl_net.c	net: sysctl_net - use net_eq to compare nets	2009-03-16 16:23:30 +01:00
TUNABLE