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
..
ani.c	ath5k: use the common cycle counter / listen time implementation	2010-10-11 15:04:20 -04:00
ani.h	ath5k: use the common cycle counter / listen time implementation	2010-10-11 15:04:20 -04:00
ath5k.h	ath5k: store the clock rate in common data on channel changes	2010-10-11 15:04:20 -04:00
attach.c	ath5k: Remove unused variable for atim window	2010-09-28 15:47:57 -04:00
base.c	ath5k: Move debugfs under ieee80211/[wiphy-name]	2010-10-13 15:45:21 -04:00
base.h	ath5k: Print rx/tx bytes in debugfs	2010-10-05 13:35:25 -04:00
caps.c	ath5k: remove ATH_TRACE macro	2010-06-02 16:13:24 -04:00
debug.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
debug.h	ath5k: Move debugfs under ieee80211/[wiphy-name]	2010-10-13 15:45:21 -04:00
desc.c	ath5k: report PHY error frames only for chips which need it	2010-06-16 14:59:07 -04:00
desc.h	ath5k: take descriptor differences between 5210 and 5211 into account	2010-06-16 14:59:06 -04:00
dma.c	ath5k: Fix bitmasks and typos for PCU Diagnostic register	2010-09-28 15:47:57 -04:00
eeprom.c	ath5k: clean up some comments	2010-08-24 16:28:00 -04:00
eeprom.h	ath5k: Minor EEPROM documentation updates	2010-03-10 17:44:42 -05:00
gpio.c	ath5k: remove ATH_TRACE macro	2010-06-02 16:13:24 -04:00
initvals.c
Kconfig
led.c	ath5k: adding LED support for AR5BXB63 cards	2010-01-27 15:01:24 -05:00
Makefile	ath5k: add sysfs files for ANI parameters	2010-06-02 16:13:26 -04:00
pcu.c	ath5k: store the clock rate in common data on channel changes	2010-10-11 15:04:20 -04:00
phy.c	ath5k: store the clock rate in common data on channel changes	2010-10-11 15:04:20 -04:00
qcu.c	ath5k: Simplify cw_min/max and AIFS configuration	2010-09-21 11:05:16 -04:00
reg.h	ath5k: Fix bitmasks and typos for PCU Diagnostic register	2010-09-28 15:47:57 -04:00
reset.c	ath5k: Allow ath5k to support virtual STA and AP interfaces.	2010-10-05 13:35:23 -04:00
rfbuffer.h	ath5k: clean up some comments	2010-08-24 16:28:00 -04:00
rfgain.h
rfkill.c
sysfs.c	ath5k: add sysfs files for ANI parameters	2010-06-02 16:13:26 -04:00