p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/drivers/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
..
Kconfig [PATCH] don't select CONFIG_HOTPLUG 2006-07-10 13:24:12 -07:00
Makefile [PATCH] pcmcia: AT91RM9200 Compact Flash driver 2006-03-31 17:05:41 +02:00
at91_cf.c [PATCH] ioremap balanced with iounmap for drivers/pcmcia 2006-10-25 21:59:43 -04:00
au1000_db1x00.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
au1000_generic.c [PATCH] ioremap balanced with iounmap for drivers/pcmcia 2006-10-25 21:59:43 -04:00
au1000_generic.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
au1000_pb1x00.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
au1000_xxs1500.c [PATCH] Alchemy PCMCIA: Fix config.h inclusion 2005-11-10 11:18:26 +01:00
cardbus.c [PATCH] cardbus: switch to ref counting/hotplug safe API 2006-10-01 00:39:23 -07:00
cirrus.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
cistpl.c [PATCH] pcmcia: remove include of config.h 2006-03-31 17:02:26 +02:00
cs.c [PATCH] pcmcia: fix deadlock in pcmcia_parse_events 2006-06-30 22:09:13 +02:00
cs_internal.h [PATCH] pcmcia: use bitfield instead of p_state and state 2006-03-31 17:26:33 +02:00
ds.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
ds_internal.h [PATCH] pcmcia: remove export of pcmcia_release_configuration 2006-03-31 17:15:53 +02:00
hd64465_ss.c Various drivers' irq handlers: kill dead code, needless casts 2006-10-06 15:00:58 -04:00
i82092.c [PATCH] i82092: wire up errors from pci_register_driver() 2006-10-25 21:59:42 -04:00
i82092aa.h IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
i82365.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
i82365.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
m8xx_pcmcia.c [PATCH] ioremap balanced with iounmap for drivers/pcmcia 2006-10-25 21:59:43 -04:00
m32r_cfc.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
m32r_cfc.h [PATCH] m32r: Update m32r_cfc.[ch] to support Mappi-III platform 2005-06-21 19:07:30 -07:00
m32r_pcc.c [PATCH] m32r pt_regs fixes 2006-10-07 10:51:15 -07:00
m32r_pcc.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
o2micro.h [PATCH] pcmcia: disable read prefetch/write burst on old O2Micro bridges 2005-07-28 08:39:01 -07:00
omap_cf.c [PATCH] ioremap balanced with iounmap for drivers/pcmcia 2006-10-25 21:59:43 -04:00
pcmcia_ioctl.c [PATCH] PCMCIA: handle sysfs, PCI errors 2006-10-25 21:59:46 -04:00
pcmcia_resource.c [PATCH] pcmcia: update alloc_io_space for conflict checking for multifunction PC card 2006-10-25 21:59:39 -04:00
pd6729.c [PATCH] CONFIG_PM=n slim: drivers/pcmcia/* 2006-10-25 21:59:41 -04:00
pd6729.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pxa2xx_base.c [ARM] Fix suspend oops caused by PXA2xx PCMCIA driver 2006-10-28 22:42:56 +01:00
pxa2xx_base.h [ARM] Fix suspend oops caused by PXA2xx PCMCIA driver 2006-10-28 22:42:56 +01:00
pxa2xx_lubbock.c [ARM] Fix suspend oops caused by PXA2xx PCMCIA driver 2006-10-28 22:42:56 +01:00
pxa2xx_mainstone.c [ARM] 3250/1: Change pxa2xx PCMCIA drivers to use platform_device_alloc 2006-01-10 17:16:12 +00:00
pxa2xx_sharpsl.c [ARM] 3478/1: SharpSL SCOOP: Fix potenial build failure 2006-04-18 23:18:53 +01:00
ricoh.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
rsrc_mgr.c [PATCH] pcmcia: size reduction if ioctl isn't compiled 2006-03-31 17:02:39 +02:00
rsrc_nonstatic.c [PATCH] 64bit Resource: convert a few remaining drivers to use resource_size_t where needed 2006-06-27 09:24:00 -07:00
sa11xx_base.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sa11xx_base.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sa1100_assabet.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sa1100_badge4.c [ARM] Fix badge4 build error 2006-06-19 15:37:31 +01:00
sa1100_cerf.c [PATCH] pcmcia: remove include of config.h 2006-03-31 17:02:26 +02:00
sa1100_generic.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sa1100_generic.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sa1100_h3600.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sa1100_jornada720.c [PATCH] ARM: 2830/1: Fix Jornada 720 PCMCIA-support 2005-07-26 19:21:47 +01:00
sa1100_neponset.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sa1100_shannon.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sa1100_simpad.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sa1111_generic.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sa1111_generic.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
soc_common.c [PATCH] Export soc_common_drv_pcmcia_remove to allow modular PCMCIA. 2006-10-25 21:59:45 -04:00
soc_common.h [PATCH] pcmcia: remove references to pcmcia/version.h 2005-07-07 18:24:07 -07:00
socket_sysfs.c pccard_store_cis: fix wrong error handling 2006-10-01 13:17:44 -07:00
tcic.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
tcic.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ti113x.h [PATCH] pcmcia: TI PCIxx12 CardBus controller support 2006-06-30 22:09:11 +02:00
topic.h [PATCH] yenta: make ToPIC95 bridges work with 16bit cards 2005-09-07 16:57:21 -07:00
vg468.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
vrc4171_card.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
vrc4173_cardu.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
vrc4173_cardu.h Update Yoichi Yuasa's email address. 2006-01-10 13:39:07 +00:00
yenta_socket.c [PATCH] PCMCIA: handle sysfs, PCI errors 2006-10-25 21:59:46 -04:00
yenta_socket.h [PATCH] yenta: make ToPIC95 bridges work with 16bit cards 2005-09-07 16:57:21 -07:00