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
au1000_generic.h
au1000_pb1x00.c
au1000_xxs1500.c
cardbus.c
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
i82092.c
i82092aa.h
i82365.c
i82365.h
Kconfig
m8xx_pcmcia.c
m32r_cfc.c	[PATCH] pcmcia: fix m32r_cfc.c compilation	2006-12-04 20:12:04 -05:00
m32r_cfc.h
m32r_pcc.c
m32r_pcc.h
Makefile
o2micro.h
omap_cf.c
pcmcia_ioctl.c	[PATCH] pcmcia: handle __copy_from_user() return value in ioctl	2006-12-04 20:09:16 -05:00
pcmcia_resource.c
pd6729.c	[PATCH] pcmcia: allow shared IRQs on pd6729 sockets	2006-12-04 20:09:15 -05:00
pd6729.h
pxa2xx_base.c
pxa2xx_base.h
pxa2xx_lubbock.c
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
soc_common.h
socket_sysfs.c	[PATCH] pcmcia: start over after CIS override	2006-12-04 20:09:14 -05:00
tcic.c
tcic.h
ti113x.h
topic.h
vg468.h
vrc4171_card.c
vrc4173_cardu.c
vrc4173_cardu.h
yenta_socket.c
yenta_socket.h