Linus Torvalds 86dca4f8e6 Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 ... * master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (33 commits) [PATCH] pcmcia: declare pccard_iodyn_ops (fix m8xx_pcmcia.c compilation error) [PATCH] pcmcia: fix pcmcia_device_remove oops [PATCH] pcmcia: Add support for Possio GCC AKA PCMCIA Siemens MC45 [PATCH] pcmcia: pseudo device handling update [PATCH] pcmcia: convert DEV_OK to pcmcia_dev_present [PATCH] pcmcia: use bitfield instead of p_state and state [PATCH] pcmcia: remove unused p_dev->state flags [PATCH] pcmcia: make pcmcia_release_{io,irq} static [PATCH] pcmcia: add return value to _config() functions [PATCH] pcmcia: remove dev_link_t and client_handle_t indirection [PATCH] pcmcia: embed dev_link_t into struct pcmcia_device [PATCH] pcmcia: rename pcmcia_device.state [PATCH] pcmcia: remove unneeded Vcc pseudo setting [PATCH] pcmcia: remove export of pcmcia_release_configuration [PATCH] pcmcia: default suspend and resume handling [PATCH] pcmcia: convert remaining users of pcmcia_release_io and _irq [PATCH] pcmcia: add pcmcia_disable_device [PATCH] serial_cs: add Merlin U630 IDs [PATCH] pcmcia: AT91RM9200 Compact Flash driver [PATCH] pcmcia: socket.functions starts with 1 ...		2006-04-02 12:49:59 -07:00
..
alchemy-flash.c	[PATCH] drivers/mtd: Use ARRAY_SIZE macro	2006-03-31 12:18:48 -08:00
amd76xrom.c
arctic-mtd.c
autcpu12-nvram.c
bast-flash.c	[DRIVER MODEL] Convert platform drivers to use struct platform_driver	2005-11-09 22:32:44 +00:00
beech-mtd.c
cdb89712.c
ceiva.c
cfi_flagadm.c	[PATCH] drivers/mtd: Use ARRAY_SIZE macro	2006-03-31 12:18:48 -08:00
cstm_mips_ixx.c
dbox2-flash.c	[PATCH] drivers/mtd: Use ARRAY_SIZE macro	2006-03-31 12:18:48 -08:00
dc21285.c	[PATCH] Fix compilation errors in maps/dc21285.c	2006-02-03 08:32:01 -08:00
dilnetpc.c	[PATCH] drivers/mtd: Use ARRAY_SIZE macro	2006-03-31 12:18:48 -08:00
dmv182.c	[PATCH] drivers/mtd: Use ARRAY_SIZE macro	2006-03-31 12:18:48 -08:00
ebony.c
edb7312.c
fortunet.c
h720x-flash.c	[PATCH] drivers/mtd: Use ARRAY_SIZE macro	2006-03-31 12:18:48 -08:00
ichxrom.c
impa7.c
integrator-flash.c	[DRIVER MODEL] Convert platform drivers to use struct platform_driver	2005-11-09 22:32:44 +00:00
ipaq-flash.c	[ARM] Drivers should not make use of architecture private __ioremap	2005-11-17 16:46:41 +00:00
iq80310.c
ixp4xx.c	[MTD] maps/ixp4xx: half-word boundary and little-endian fixups	2005-11-29 19:29:37 +01:00
ixp2000.c	[DRIVER MODEL] Fix merge clashes with ARM ixp2000 / ixp4xx platforms	2005-11-17 15:47:30 +00:00
Kconfig	[ARM] Remove EPXA10DB machine support	2006-01-08 22:37:46 +00:00
l440gx.c
lasat.c
lubbock-flash.c
mainstone-flash.c
Makefile	[ARM] Remove EPXA10DB machine support	2006-01-08 22:37:46 +00:00
map_funcs.c
mbx860.c
mpc1211.c
mtx-1_flash.c
netsc520.c	[PATCH] drivers/mtd: Use ARRAY_SIZE macro	2006-03-31 12:18:48 -08:00
nettel.c	[PATCH] drivers/mtd: Use ARRAY_SIZE macro	2006-03-31 12:18:48 -08:00
ocelot.c
ocotea.c	[PATCH] drivers/mtd: Use ARRAY_SIZE macro	2006-03-31 12:18:48 -08:00
octagon-5066.c
omap_nor.c	[DRIVER MODEL] Convert platform drivers to use struct platform_driver	2005-11-09 22:32:44 +00:00
omap-toto-flash.c
pci.c	[PATCH] Dead code in mtd/maps/pci.c	2006-03-31 12:18:49 -08:00
pcmciamtd.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2006-04-02 12:49:59 -07:00
physmap.c	[MTD] Make functions static, include header files with prototypes	2005-11-29 19:54:58 +01:00
plat-ram.c	[DRIVER MODEL] Convert platform drivers to use struct platform_driver	2005-11-09 22:32:44 +00:00
pnc2000.c
pq2fads.c
redwood.c	[PATCH] drivers/mtd: Use ARRAY_SIZE macro	2006-03-31 12:18:48 -08:00
rpxlite.c
sa1100-flash.c	[DRIVER MODEL] Convert platform drivers to use struct platform_driver	2005-11-09 22:32:44 +00:00
sbc8240.c	[PATCH] drivers/mtd: Use ARRAY_SIZE macro	2006-03-31 12:18:48 -08:00
sbc_gxx.c
sc520cdp.c	[PATCH] drivers/mtd: Use ARRAY_SIZE macro	2006-03-31 12:18:48 -08:00
scb2_flash.c
scx200_docflash.c	[PATCH] drivers/mtd: Use ARRAY_SIZE macro	2006-03-31 12:18:48 -08:00
sharpsl-flash.c	[PATCH] drivers/mtd: Use ARRAY_SIZE macro	2006-03-31 12:18:48 -08:00
solutionengine.c
sun_uflash.c
tqm8xxl.c
tqm834x.c
ts5500_flash.c	[PATCH] drivers/mtd: Use ARRAY_SIZE macro	2006-03-31 12:18:48 -08:00
tsunami_flash.c	[PATCH] tsunami_flash: fix "parse error before ';' token"	2006-02-01 08:53:10 -08:00
uclinux.c	[PATCH] drivers/mtd: Use ARRAY_SIZE macro	2006-03-31 12:18:48 -08:00
vmax301.c	[PATCH] drivers/mtd/maps/vmax301.c: fix off by one vmax_mtd	2006-03-31 12:18:49 -08:00
walnut.c
wr_sbc82xx_flash.c