summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-12-122-2/+2
|\
| * Merge tag 'for-3.8-at91_header_clean' of git://github.com/at91linux/linux-at9...Arnd Bergmann2012-11-121-1/+1
| |\
| | * arm: at91: move platfarm_data to include/linux/platform_data/atmel.hJean-Christophe PLAGNIOL-VILLARD2012-11-061-1/+1
| * | Merge branch 'depends/tty' into next/headersOlof Johansson2012-11-051-1/+1
| |\ \ | | |/
| * | ARM: OMAP1: Move plat/tc.h to mach/tc.h for omap1Tony Lindgren2012-10-171-1/+1
* | | pcmcia: remove use of __devexitBill Pemberton2012-11-2812-13/+13
* | | pcmcia: remove use of __devinitdataBill Pemberton2012-11-281-1/+1
* | | pcmcia: remove use of __devinitBill Pemberton2012-11-2820-26/+26
* | | pcmcia: remove use of __devexit_pBill Pemberton2012-11-289-10/+10
* | | pcmcia: remove CONFIG_HOTPLUG ifdefsBill Pemberton2012-11-281-11/+0
| |/ |/|
* | Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/...Olof Johansson2012-10-191-1/+1
|\ \ | |/ |/|
| * pcmcia: sharpsl: don't discard sharpsl_pcmcia_opsArnd Bergmann2012-10-121-1/+1
* | Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2012-10-011-1/+1
|\ \
| * \ Merge branch 'multiplatform/platform-data' into next/multiplatformOlof Johansson2012-09-221-1/+1
| |\ \
| | * | ARM: pxa: move platform_data definitionsArnd Bergmann2012-09-141-1/+1
| | |/
* | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-10-011-1/+1
|\ \ \ | |/ /
| * | ARM: OMAP1: Make plat/mux.h omap1 onlyTony Lindgren2012-09-201-1/+1
| |/
* | Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2012-10-011-1/+1
|\ \
| * | ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe()Wei Yongjun2012-09-211-1/+1
| |/
* | pcmcia: Use common pci_stop_and_remove_bus_device()Bjorn Helgaas2012-08-221-3/+12
|/
* Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-07-271-0/+1
|\
| * ARM: sa11x0/pxa: convert OS timer registers to IOMEMRussell King2012-07-091-0/+1
* | PCI: replace struct pci_bus secondary/subordinate with busn_resYinghai Lu2012-06-132-14/+14
|/
* pcmcia: add driver for hx4700Paul Parsons2012-05-073-1/+123
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmciaLinus Torvalds2012-03-2912-121/+43
|\
| * pcmcia at91_cf: fix raw gpio number usageJoachim Eastwood2012-03-031-26/+26
| * ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probeAxel Lin2012-03-031-9/+3
| * pcmcia: Convert to DEFINE_PCI_DEVICE_TABLEAxel Lin2012-03-035-22/+9
| * pcmcia: convert drivers/pcmcia/* to use module_platform_driver()Axel Lin2012-03-036-71/+6
| * pcmcia: irq: Remove IRQF_DISABLEDYong Zhang2012-03-032-3/+3
* | Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-2813-13/+0
|\ \
| * | Remove all #inclusions of asm/system.hDavid Howells2012-03-2813-13/+0
* | | Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-272-13/+49
|\ \ \
| * \ \ Merge branch 'sa1111' into sa11x0Russell King2012-03-251-7/+48
| |\ \ \
| | * | | ARM: sa1111: move PCMCIA interface register definitions to sa1111_generic.cRussell King2012-03-241-5/+39
| | * | | ARM: sa1111: add platform enable/disable functionsRussell King2012-02-091-2/+9
| | | |/ | | |/|
| * | | ARM: sa11x0: neponset: provide function to manipulate NCR_0Russell King2012-02-091-6/+1
| |/ /
* | | Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-271-2/+3
|\ \ \
| * \ \ Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dtOlof Johansson2012-03-081-9/+3
| |\ \ \
| * \ \ \ Merge branch 'at91-3.4-base2+cleanup' of git://github.com/at91linux/linux-at9...Arnd Bergmann2012-02-291-2/+3
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | ARM: at91: make sdram/ddr register base soc independentJean-Christophe PLAGNIOL-VILLARD2012-02-231-2/+3
* | | | | Merge branch 'pcmcia' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-2332-856/+348
|\ \ \ \ \
| * | | | | PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix.Russell King2012-02-215-4/+4
| * | | | | PCMCIA: make lubbock socket driver part of sa1111_csRussell King2012-02-212-4/+4
| * | | | | PCMCIA: add Kconfig control for building sa11xx_base.cRussell King2012-02-212-2/+8
| * | | | | PCMCIA: sa1111: jornada720: no need to disable IRQs around sa1111_set_ioRussell King2012-02-211-6/+1
| * | | | | PCMCIA: sa1111: pass along sa1111_pcmcia_configure_socket() failure codeRussell King2012-02-212-2/+2
| * | | | | PCMCIA: soc_common: remove explicit wrprot initialization in socket driversRussell King2012-02-2119-21/+0
| * | | | | PCMCIA: soc_common: remove soc_pcmcia_*_irqs functionsRussell King2012-02-212-73/+0
| * | | | | PCMCIA: sa11x0: h3600: convert to use new irq/gpio managementRussell King2012-02-211-80/+15
OpenPOWER on IntegriCloud