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
..
arm
cris
h8300
legacy	[PATCH] pcmcia: use bitfield instead of p_state and state	2006-03-31 17:26:33 +02:00
mips	[PATCH] handle errors returned by platform_get_irq*()	2006-03-20 13:42:57 -08:00
pci	Merge ../linux-2.6	2006-03-29 13:24:50 +11:00
ppc	[PATCH] powerpc: Kill _machine and hard-coded platform numbers	2006-03-28 23:15:54 +11:00
ide-cd.c	[PATCH] ide-cd: quiet down GPCMD_READ_CDVD_CAPACITY failure	2006-03-27 09:29:02 +02:00
ide-cd.h
ide-disk.c	[PATCH] LED: Add IDE disk activity LED trigger	2006-03-31 12:18:57 -08:00
ide-dma.c	[PATCH] s/;;/;/g	2006-03-24 07:33:24 -08:00
ide-floppy.c	[PATCH] sem2mutex: drivers/ide	2006-03-23 07:38:14 -08:00
ide-generic.c
ide-io.c
ide-iops.c
ide-lib.c
ide-pnp.c
ide-probe.c	[PATCH] ide: Allow IDE interface to specify its not capable of 32-bit operations	2006-03-24 07:33:28 -08:00
ide-proc.c
ide-tape.c	[PATCH] ide-tape: use time_after(), time_after_eq()	2006-03-28 09:16:07 -08:00
ide-taskfile.c	[PATCH] Ensure ide-taskfile calls any driver specific end_request function	2006-03-31 12:18:57 -08:00
ide-timing.h
ide.c	[PATCH] ide: fix section mismatch warning	2006-03-25 08:22:53 -08:00
Kconfig
Makefile
setup-pci.c