2be4ff2f08
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits) pcmcia: ioctl-internal definitions pcmcia: cistpl header cleanup pcmcia: remove unused argument to pcmcia_parse_tuple() pcmcia: card services header cleanup pcmcia: device_id header cleanup pcmcia: encapsulate ioaddr_t pcmcia: cleanup device driver header file pcmcia: cleanup socket services header file pcmcia: merge ds_internal.h into cs_internal.h pcmcia: cleanup cs_internal.h pcmcia: cs_internal.h is internal pcmcia: use dev_printk for cs_error() pcmcia: remove CS_ error codes alltogether pcmcia: deprecate CS_BAD_TUPLE pcmcia: deprecate CS_BAD_ARGS pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE pcmcia: deprecate CS_NO_MORE_ITEMS pcmcia: deprecate CS_IN_USE pcmcia: deprecate CS_CONFIGURATION_LOCKED ... Fix trivial conflict in drivers/pcmcia/ds.c manually |
||
---|---|---|
.. | ||
arm | ||
h8300 | ||
legacy | ||
mips | ||
pci | ||
ppc | ||
ide-acpi.c | ||
ide-atapi.c | ||
ide-cd.c | ||
ide-cd.h | ||
ide-cd_ioctl.c | ||
ide-cd_verbose.c | ||
ide-disk.c | ||
ide-dma.c | ||
ide-floppy.c | ||
ide-floppy.h | ||
ide-floppy_ioctl.c | ||
ide-generic.c | ||
ide-io.c | ||
ide-ioctls.c | ||
ide-iops.c | ||
ide-lib.c | ||
ide-pio-blacklist.c | ||
ide-pnp.c | ||
ide-probe.c | ||
ide-proc.c | ||
ide-scan-pci.c | ||
ide-tape.c | ||
ide-taskfile.c | ||
ide-timings.c | ||
ide.c | ||
Kconfig | ||
Makefile | ||
setup-pci.c |