Linus Torvalds 5f05647dd8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1699 commits) bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL. vlan: Calling vlan_hwaccel_do_receive() is always valid. tproxy: use the interface primary IP address as a default value for --on-ip tproxy: added IPv6 support to the socket match cxgb3: function namespace cleanup tproxy: added IPv6 support to the TPROXY target tproxy: added IPv6 socket lookup function to nf_tproxy_core be2net: Changes to use only priority codes allowed by f/w tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled tproxy: added tproxy sockopt interface in the IPV6 layer tproxy: added udp6_lib_lookup function tproxy: added const specifiers to udp lookup functions tproxy: split off ipv6 defragmentation to a separate module l2tp: small cleanup nf_nat: restrict ICMP translation for embedded header can: mcp251x: fix generation of error frames can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set can-raw: add msg_flags to distinguish local traffic 9p: client code cleanup rds: make local functions/variables static ... Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and drivers/net/wireless/ath/ath9k/debug.c as per David		2010-10-23 11:47:02 -07:00
..
b43legacy.h	drivers/net: use __packed annotation	2010-06-03 03:18:23 -07:00
debugfs.c	net/wireless: use generic_file_llseek in debugfs	2010-09-16 10:33:08 +02:00
debugfs.h
dma.c	b43legacy: replace the ssb_dma API with the generic DMA API	2010-06-04 16:00:42 -04:00
dma.h	drivers/net: use __packed annotation	2010-06-03 03:18:23 -07:00
ilt.c
ilt.h
Kconfig
leds.c
leds.h	b43legacy: fix typo in ifdef comment	2010-02-15 16:12:53 -05:00
main.c	b43legacy: update hw/fw version info in wiphy struct	2010-08-16 14:39:45 -04:00
main.h
Makefile
phy.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
phy.h
pio.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
pio.h	b43legacy: remove get_tx_stats() mac80211 op	2010-02-08 16:51:00 -05:00
radio.c
radio.h
rfkill.c
rfkill.h
sysfs.c
sysfs.h
xmit.c	b43legacy: remove usage of deprecated noise value	2010-04-28 16:48:21 -04:00
xmit.h	drivers/net: use __packed annotation	2010-06-03 03:18:23 -07:00