Linus Torvalds 4a24eef671 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: (34 commits) net: fix build erros with CONFIG_BUG=n, CONFIG_GENERIC_BUG=n ipv6: skb_dst() can be NULL in ipv6_hop_jumbo(). tg3: Update copyright and driver version tg3: Disable 5717 serdes and B0 support tg3: Add reliable serdes detection for 5717 A0 tg3: Fix std rx prod ring handling tg3: Fix std prod ring nicaddr for 5787 and 57765 sfc: Fix conditions for MDIO self-test sfc: Fix polling for slow MCDI operations e1000e: workaround link issues on busy hub in half duplex on 82577/82578 e1000e: MDIO slow mode should always be done for 82577 ixgbe: update copyright dates ixgbe: Do not attempt to perform interrupts in netpoll when down cfg80211: fix refcount imbalance when wext is disabled mac80211: fix queue selection for data frames on monitor interfaces iwlwifi: silence buffer overflow warning iwlwifi: disable tx on beacon update notification iwlwifi: fix iwl_queue_used bug when read_ptr == write_ptr mac80211: fix endian error mac80211: add missing sanity checks for action frames ...		2010-01-14 08:36:15 -08:00
..
9p	9p connect fixes	2009-12-16 12:16:41 -05:00
802	sysctl net: Remove unused binary sysctl code	2009-11-12 02:05:06 -08:00
8021q	netdevice: provide common routine for macvlan and vlan operstate management	2009-12-03 15:59:22 -08:00
appletalk	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
atm	atm: [br2684] allow routed mode operation again	2009-12-08 20:22:31 -08:00
ax25	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
bluetooth	Bluetooth: Fix L2CAP locking scheme regression	2009-12-17 12:07:25 -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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-12 20:53:29 -08:00
dcb	net: Move && and || to end of previous line	2009-11-29 16:55:45 -08:00
dccp	kfifo: rename kfifo_put... into kfifo_in... and kfifo_get... into kfifo_out...	2009-12-22 14:17:56 -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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-12 20:53:29 -08:00
ipv6	ipv6: skb_dst() can be NULL in ipv6_hop_jumbo().	2010-01-13 17:27:37 -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	tree-wide: convert open calls to remove spaces to skip_spaces() lib function	2009-12-15 08:53:32 -08:00
iucv	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
key	xfrm: Fix truncation length of authentication algorithms installed via PF_KEY	2009-12-11 15:07:57 -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 git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2010-01-12 21:33:49 -08:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-12 20:53:29 -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	net: use net_eq to compare nets	2009-11-25 15:14:13 -08:00
netrom	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -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	rose_loopback_timer sets VC number <= ROSE_DEFAULT_MAXVC	2010-01-03 21:21:16 -08:00
rxrpc	net: use net_eq to compare nets	2009-11-25 15:14:13 -08:00
sched	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -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 refcount imbalance when wext is disabled	2010-01-11 19:37:09 -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	NET: XFRM: Fix spelling of neighbour.	2009-12-26 20:24:46 -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
TUNABLE	…
compat.c	net: use compat helper functions in compat_sys_recvmmsg	2009-12-11 15:07:57 -08: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