Linus Torvalds 3f5785ec31 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: (89 commits) bonding: documentation and code cleanup for resend_igmp bonding: prevent deadlock on slave store with alb mode (v3) net: hold rtnl again in dump callbacks Add Fujitsu 1000base-SX PCI ID to tg3 bnx2x: protect sequence increment with mutex sch_sfq: fix peek() implementation isdn: netjet - blacklist Digium TDM400P via-velocity: don't annotate MAC registers as packed xen: netfront: hold RTNL when updating features. sctp: fix memory leak of the ASCONF queue when free asoc net: make dev_disable_lro use physical device if passed a vlan dev (v2) net: move is_vlan_dev into public header file (v2) bug.h: Fix build with CONFIG_PRINTK disabled. wireless: fix fatal kernel-doc error + warning in mac80211.h wireless: fix cfg80211.h new kernel-doc warnings iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled dst: catch uninitialized metrics be2net: hash key for rss-config cmd not set bridge: initialize fake_rtable metrics net: fix __dst_destroy_metrics_generic() ... Fix up trivial conflicts in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c		2011-05-25 17:00:17 -07:00
..
act200l-sir.c	drivers/net/*/: Use static const	2010-12-21 02:16:10 -08:00
actisys-sir.c
ali-ircc.c	treewide: fix a few typos in comments	2011-05-10 10:16:21 +02: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: convert bfin_sir to common Blackfin UART header	2011-05-24 01:13:11 -04:00
bfin_sir.h	net/irda: convert bfin_sir to common Blackfin UART header	2011-05-24 01:13:11 -04:00
donauboe.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
donauboe.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
ep7211-sir.c
esi-sir.c
girbil-sir.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
irda-usb.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
irda-usb.h	drivers/net: use __packed annotation	2010-06-03 03:18:23 -07:00
irtty-sir.c	tty: make receive_buf() return the amout of bytes received	2011-04-22 17:31:53 -07: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	Fix common misspellings	2011-03-31 11:26:23 -03:00
mcs7780.h
nsc-ircc.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
nsc-ircc.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
old_belkin-sir.c
pxaficp_ir.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
sa1100_ir.c	net: trans_start cleanups	2010-05-10 05:01:31 -07:00
sh_irda.c	net/irda/sh_irda: return to RX mode when TX error	2011-01-18 16:13:51 -08:00
sh_sir.c	SuperH IrDA: correct Baud rate error correction	2010-11-21 10:09:53 -08: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	net: fix section mismatches	2011-04-18 22:59:04 -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	Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6	2011-04-07 11:14: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	Fix common misspellings	2011-03-31 11:26:23 -03:00
w83977af_ir.c	net: trans_start cleanups	2010-05-10 05:01:31 -07:00
w83977af_ir.h
w83977af.h