renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 02:04:05 +08:00
Code
6d5aefb8ea
linux-next/drivers/net/hamradio
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
6pack.c [6PACK]: Masking bug in 6pack driver. 2006-11-25 15:16:50 -08:00
baycom_epp.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
baycom_par.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
baycom_ser_fdx.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
baycom_ser_hdx.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
bpqether.c [BPQ] lockdep: fix false positive 2006-07-10 14:50:33 -07:00
dmascc.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
hdlcdrv.c [AX.25]: Rename ax25_encapsulate to ax25_hard_header 2005-09-12 14:21:01 -07:00
Kconfig [PATCH] SMACK support for mkiss 2005-10-18 17:02:14 -04:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mkiss.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
scc.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
yam1200.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
yam9600.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
yam.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
z8530.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00