aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAge
* Merge tag 'omap-for-v3.8/cleanup-headers-signed' into omap-for-v3.8/cleanup-h...Tony Lindgren2012-10-24
|\
| * ARM: OMAP1: Move plat/tc.h to mach/tc.h for omap1Tony Lindgren2012-10-17
* | Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/...Olof Johansson2012-10-19
|\ \ | |/ |/|
| * pcmcia: sharpsl: don't discard sharpsl_pcmcia_opsArnd Bergmann2012-10-12
* | Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2012-10-01
|\ \
| * \ Merge branch 'multiplatform/platform-data' into next/multiplatformOlof Johansson2012-09-22
| |\ \
| | * | ARM: pxa: move platform_data definitionsArnd Bergmann2012-09-14
| | |/
* | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-10-01
|\| |
| * | ARM: OMAP1: Make plat/mux.h omap1 onlyTony Lindgren2012-09-20
| |/
* | Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2012-10-01
|\ \
| * | ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe()Wei Yongjun2012-09-21
| |/
* / pcmcia: Use common pci_stop_and_remove_bus_device()Bjorn Helgaas2012-08-22
|/
* Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-07-27
|\
| * ARM: sa11x0/pxa: convert OS timer registers to IOMEMRussell King2012-07-09
* | PCI: replace struct pci_bus secondary/subordinate with busn_resYinghai Lu2012-06-13
|/
* pcmcia: add driver for hx4700Paul Parsons2012-05-06
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmciaLinus Torvalds2012-03-29
|\
| * pcmcia at91_cf: fix raw gpio number usageJoachim Eastwood2012-03-03
| * ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probeAxel Lin2012-03-03
| * pcmcia: Convert to DEFINE_PCI_DEVICE_TABLEAxel Lin2012-03-03
| * pcmcia: convert drivers/pcmcia/* to use module_platform_driver()Axel Lin2012-03-03
| * pcmcia: irq: Remove IRQF_DISABLEDYong Zhang2012-03-03
* | Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-28
|\ \
| * | Remove all #inclusions of asm/system.hDavid Howells2012-03-28
* | | Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-27
|\ \ \
| * \ \ Merge branch 'sa1111' into sa11x0Russell King2012-03-25
| |\ \ \
| | * | | ARM: sa1111: move PCMCIA interface register definitions to sa1111_generic.cRussell King2012-03-24
| | * | | ARM: sa1111: add platform enable/disable functionsRussell King2012-02-09
| | | |/ | | |/|
| * / | ARM: sa11x0: neponset: provide function to manipulate NCR_0Russell King2012-02-09
| |/ /
* | | Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-27
|\ \ \
| * \ \ Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dtOlof Johansson2012-03-08
| |\ \ \
| * \ \ \ Merge branch 'at91-3.4-base2+cleanup' of git://github.com/at91linux/linux-at9...Arnd Bergmann2012-02-29
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | ARM: at91: make sdram/ddr register base soc independentJean-Christophe PLAGNIOL-VILLARD2012-02-23
* | | | | Merge branch 'pcmcia' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-23
|\ \ \ \ \
| * | | | | PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix.Russell King2012-02-21
| * | | | | PCMCIA: make lubbock socket driver part of sa1111_csRussell King2012-02-21
| * | | | | PCMCIA: add Kconfig control for building sa11xx_base.cRussell King2012-02-21
| * | | | | PCMCIA: sa1111: jornada720: no need to disable IRQs around sa1111_set_ioRussell King2012-02-21
| * | | | | PCMCIA: sa1111: pass along sa1111_pcmcia_configure_socket() failure codeRussell King2012-02-21
| * | | | | PCMCIA: soc_common: remove explicit wrprot initialization in socket driversRussell King2012-02-21
| * | | | | PCMCIA: soc_common: remove soc_pcmcia_*_irqs functionsRussell King2012-02-21
| * | | | | PCMCIA: sa11x0: h3600: convert to use new irq/gpio managementRussell King2012-02-21
| * | | | | PCMCIA: sa11x0: simpad: convert to use new irq/gpio managementRussell King2012-02-21
| * | | | | PCMCIA: sa11x0: shannon: convert to use new irq/gpio managementRussell King2012-02-21
| * | | | | PCMCIA: sa11x0: nanoengine: convert reset handling to use GPIO subsystemRussell King2012-02-04
| * | | | | PCMCIA: sa11x0: nanoengine: convert to use new irq/gpio managementRussell King2012-02-04
| * | | | | PCMCIA: sa11x0: cerf: convert reset handling to use GPIO subsystemRussell King2012-02-04
| * | | | | PCMCIA: sa11x0: cerf: convert to use new irq/gpio managementRussell King2012-02-04
| * | | | | PCMCIA: sa11x0: assabet: convert to use new irq/gpio managementRussell King2012-02-04
| * | | | | PCMCIA: sa1111: use new per-socket irq/gpio infrastructureRussell King2012-02-04