You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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 ...		19 years ago
..
arm	…
cris	…
h8300	…
legacy	[PATCH] pcmcia: use bitfield instead of p_state and state	19 years ago
mips	…
pci	Merge ../linux-2.6	19 years ago
ppc	[PATCH] powerpc: Kill _machine and hard-coded platform numbers	19 years ago
Kconfig	…
Makefile	…
ide-cd.c	[PATCH] ide-cd: quiet down GPCMD_READ_CDVD_CAPACITY failure	19 years ago
ide-cd.h	…
ide-disk.c	[PATCH] LED: Add IDE disk activity LED trigger	19 years ago
ide-dma.c	…
ide-floppy.c	…
ide-generic.c	…
ide-io.c	…
ide-iops.c	…
ide-lib.c	…
ide-pnp.c	…
ide-probe.c	…
ide-proc.c	…
ide-tape.c	[PATCH] ide-tape: use time_after(), time_after_eq()	19 years ago
ide-taskfile.c	[PATCH] Ensure ide-taskfile calls any driver specific end_request function	19 years ago
ide-timing.h	…
ide.c	[PATCH] ide: fix section mismatch warning	19 years ago
setup-pci.c	…