David Howells 4796b71fbb Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: drivers/pcmcia/ds.c Fix up merge failures with Linus's head and fix new compile failures. Signed-Off-By: David Howells <dhowells@redhat.com>		2006-12-06 15:01:18 +00:00
..
at91_cf.c	[PATCH] pcmcia: at91_cf update	2006-12-04 20:19:30 -05:00
au1000_db1x00.c
au1000_generic.c	[PATCH] ioremap balanced with iounmap for drivers/pcmcia	2006-10-25 21:59:43 -04:00
au1000_generic.h
au1000_pb1x00.c
au1000_xxs1500.c
cardbus.c	[PATCH] cardbus: switch to ref counting/hotplug safe API	2006-10-01 00:39:23 -07:00
cirrus.h
cistpl.c
cs_internal.h	[PATCH] pcmcia: start over after CIS override	2006-12-04 20:09:14 -05:00
cs.c
ds_internal.h
ds.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-06 15:01:18 +00: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
Kconfig
m8xx_pcmcia.c	[PATCH] ioremap balanced with iounmap for drivers/pcmcia	2006-10-25 21:59:43 -04:00
m32r_cfc.c	[PATCH] pcmcia: fix m32r_cfc.c compilation	2006-12-04 20:12:04 -05:00
m32r_cfc.h
m32r_pcc.c	[PATCH] m32r pt_regs fixes	2006-10-07 10:51:15 -07:00
m32r_pcc.h
Makefile
o2micro.h
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 __copy_from_user() return value in ioctl	2006-12-04 20:09:16 -05: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] pcmcia: allow shared IRQs on pd6729 sockets	2006-12-04 20:09:15 -05:00
pd6729.h
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
pxa2xx_sharpsl.c
ricoh.h
rsrc_mgr.c
rsrc_nonstatic.c
sa11xx_base.c
sa11xx_base.h
sa1100_assabet.c
sa1100_badge4.c
sa1100_cerf.c
sa1100_generic.c
sa1100_generic.h
sa1100_h3600.c
sa1100_jornada720.c
sa1100_neponset.c
sa1100_shannon.c
sa1100_simpad.c
sa1111_generic.c
sa1111_generic.h
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
socket_sysfs.c	[PATCH] pcmcia: start over after CIS override	2006-12-04 20:09:14 -05:00
tcic.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
tcic.h
ti113x.h
topic.h
vg468.h
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
yenta_socket.c	[PATCH] PCMCIA: handle sysfs, PCI errors	2006-10-25 21:59:46 -04:00
yenta_socket.h