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
..
act200l-sir.c
actisys-sir.c
ali-ircc.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
ali-ircc.h
au1k_ir.c	net: trans_start cleanups	2010-05-10 05:01:31 -07:00
au1000_ircc.h
bfin_sir.c	net/irda: bfin_sir: IRDA is not affected by anomaly 05000230	2010-05-23 23:57:45 -07:00
bfin_sir.h	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
donauboe.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
donauboe.h	drivers/net: use __packed annotation	2010-06-03 03:18:23 -07:00
ep7211-sir.c
esi-sir.c
girbil-sir.c
irda-usb.c	irda: Test index before read in stir421x_patch_device()	2010-10-11 02:11:58 +02:00
irda-usb.h	drivers/net: use __packed annotation	2010-06-03 03:18:23 -07:00
irtty-sir.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
irtty-sir.h
Kconfig	net/irda: Add SuperH IrDA driver support	2010-04-06 19:50:21 -07:00
kingsun-sir.c
ks959-sir.c	drivers/net: use __packed annotation	2010-06-03 03:18:23 -07:00
ksdazzle-sir.c	drivers/net: use __packed annotation	2010-06-03 03:18:23 -07:00
litelink-sir.c
ma600-sir.c
Makefile	net/irda: Add SuperH IrDA driver support	2010-04-06 19:50:21 -07:00
mcp2120-sir.c
mcs7780.c	drivers/net/irda: Adjust confusing if indentation	2010-08-16 21:06:26 -07:00
mcs7780.h
nsc-ircc.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
nsc-ircc.h
old_belkin-sir.c
pxaficp_ir.c	net: trans_start cleanups	2010-05-10 05:01:31 -07:00
sa1100_ir.c	net: trans_start cleanups	2010-05-10 05:01:31 -07:00
sh_irda.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable	2010-08-06 18:13:19 +01:00
sh_sir.c	drivers: irda: fix sign bug	2010-07-15 20:27:57 -07:00
sir_dev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
sir_dongle.c
sir-dev.h
smsc-ircc2.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
smsc-ircc2.h
smsc-sio.h
stir4200.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
tekram-sir.c
toim3232-sir.c
via-ircc.c	drivers/net/irda: Eliminate memory leak	2010-08-25 16:36:49 -07:00
via-ircc.h	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
vlsi_ir.c	net: trans_start cleanups	2010-05-10 05:01:31 -07:00
vlsi_ir.h	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
w83977af_ir.c	net: trans_start cleanups	2010-05-10 05:01:31 -07:00
w83977af_ir.h
w83977af.h