aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAge
* Merge branch 'origin' into develRussell King2009-03-28
|\
| * platform driver: fix incorrect use of 'platform_bus_type' with 'struct device...Ming Lei2009-03-24
| * pcmcia: struct device - replace bus_id with dev_name(), dev_set_name()Kay Sievers2009-03-24
* | Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/...Russell King2009-03-28
|\ \
| * | [ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0Marek Vasut2009-03-28
* | | [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.hRussell King2009-03-25
* | | [ARM] 5426/1: h3600: remove clr_h3600_egpio/set_h3600_egpio helpersDmitry Artamonow2009-03-15
|/ /
* | [ARM] pxa: move pxa2xx chip selects definitions out of pxa-regs.hEric Miao2009-03-09
* | [ARM] pxa: move PCMCIA definitions out of pxa-regs.h into pxa2xx_base.cEric Miao2009-03-09
* | [ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.hEric Miao2009-03-09
|/
* powerpc: Change u64/s64 to a long long integer typeIngo Molnar2009-01-12
* Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/l...Russell King2008-12-17
|\
| * pcmcia: blackfin: fix bug - add missing ; to MODULE macroMike Frysinger2008-12-15
* | [PCMCIA] e740 PCMCIA socket driver.Ian Molton2008-12-14
|/
* pcmcia: ensure correct logging in do_io_probeDominik Brodowski2008-11-09
* pcmcia: add braces in error pathDominik Brodowski2008-11-02
* pcmcia: struct device - replace bus_id with dev_name(), dev_set_name()Kay Sievers2008-11-02
* pcmcia: setup resource information for pseudo multifunction devices.Komuro2008-11-02
* pcmcia: fix indentation & braces disagreement - add bracesIlpo Järvinen2008-11-01
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...Paul Mundt2008-10-31
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2008-10-30
| |\
| | * pcmcia: Whine harder about use of EXCLUSIVEAlan Cox2008-10-17
* | | sh: Kill off long-dead HD64465 cchip support.Paul Mundt2008-10-28
|/ /
* | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-10-23
|\ \
| * | [ARM] pxa: fix trizeps PCMCIA buildRussell King2008-10-17
| |/
* | Merge branch 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2008-10-20
|\ \ | |/ |/|
| * generic: sparse irqs: use irq_desc() together with dyn_array, instead of irq_...Yinghai Lu2008-10-16
| * drivers/pcmcia: use nr_irqsYinghai Lu2008-10-16
* | [ARM] 5307/1: pxa: fix CM-X2XX PCMCIA build errorMike Rapoport2008-10-15
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2008-10-13
|\
| * pcmcia: remove unused argument to pcmcia_parse_tuple()Dominik Brodowski2008-08-31
| * pcmcia: card services header cleanupDominik Brodowski2008-08-31
| * pcmcia: encapsulate ioaddr_tDominik Brodowski2008-08-29
| * pcmcia: cleanup socket services header fileDominik Brodowski2008-08-25
| * pcmcia: merge ds_internal.h into cs_internal.hDominik Brodowski2008-08-25
| * pcmcia: cleanup cs_internal.hDominik Brodowski2008-08-25
| * pcmcia: cs_internal.h is internalDominik Brodowski2008-08-25
| * pcmcia: use dev_printk for cs_error()Dominik Brodowski2008-08-22
| * pcmcia: deprecate CS_BAD_TUPLEDominik Brodowski2008-08-22
| * pcmcia: deprecate CS_BAD_ARGSDominik Brodowski2008-08-22
| * pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZEDominik Brodowski2008-08-22
| * pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGEDominik Brodowski2008-08-22
| * pcmcia: deprecate CS_NO_MORE_ITEMSDominik Brodowski2008-08-22
| * pcmcia: deprecate CS_IN_USEDominik Brodowski2008-08-22
| * pcmcia: deprecate CS_CONFIGURATION_LOCKEDDominik Brodowski2008-08-22
| * pcmcia: deprecate CS_BAD_HANDLEDominik Brodowski2008-08-22
| * pcmcia: deprecate CS_GENERAL_FAILUREDominik Brodowski2008-08-22
| * pcmcia: deprecate CS_NO_CARDDominik Brodowski2008-08-22
| * pcmcia: deprecate CS_BAD_VCC and CS_BAD_VPPDominik Brodowski2008-08-22
| * pcmcia: deprecate CS_UNSUPPORTED_*Dominik Brodowski2008-08-22