p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/drivers/net/pcmcia
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
..
3c574_cs.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
3c589_cs.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
Kconfig Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
axnet_cs.c drivers/net: eliminate irq handler impossible checks, needless casts 2006-10-06 14:56:04 -04:00
com20020_cs.c [PATCH] com20020_cs: more device support 2006-06-30 22:09:13 +02:00
fmvj18x_cs.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
ibmtr_cs.c drivers/net: const-ify ethtool_ops declarations 2006-09-13 14:30:00 -04:00
nmclan_cs.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
ositech.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pcnet_cs.c [PATCH] network: pcnet_cs: remove the code to change the E8390_CMD register from ei_watchdog() 2006-12-02 00:12:02 -05:00
smc91c92_cs.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
xirc2ps_cs.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00