aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAge
* 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
| * | | | PCMCIA: pxa: convert PXA socket drivers to use new irq/gpio managementRussell King2012-02-04
| * | | | PCMCIA: soc_common: add GPIO support for card status signalsRussell King2012-01-26
| * | | | PCMCIA: soc_common: move common initialization into soc_commonRussell King2012-01-26
* | | | | Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2012-03-23
|\ \ \ \ \
| * | | | | PCI: Rename pci_remove_behind_bridge to pci_stop_and_remove_behind_bridgeYinghai Lu2012-02-27
| |/ / / /
* | | | | Merge 3.3-rc6 into driver-core-nextGreg Kroah-Hartman2012-03-09
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probeAxel Lin2012-02-15
| | |/ / | |/| |
| * | | pcmcia: fix socket refcount decrementing on each resumeRussell King2012-02-08
| | |/ | |/|
* | | Merge 3.3-rc2 into the driver-core-next branch.Greg Kroah-Hartman2012-02-02
|\| |
| * | PCMCIA: fix sa1111 oops on removeRussell King2012-01-24
| |/
* | USB/PCI/PCMCIA: Clean up new_id and remove_id sysfs attribute routinesAlan Stern2012-01-26
* | Dynamic ID addition doesn't need get_driver()Alan Stern2012-01-24
|/
* Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-01-14
|\
| * MIPS: Alchemy: Basic support for the DB1300 board.Manuel Lauss2011-12-07
| * MIPS: Alchemy: remove PB1000 supportManuel Lauss2011-12-07
* | module_param: make bool parameters really bool (drivers & misc)Rusty Russell2012-01-12
* | pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()Axel Lin2011-12-28
* | driver: pcmcia: replace IRQ_GPIO() with gpio_to_irq()Haojian Zhuang2011-11-15
|/
* Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-06
|\
| * pcmcia: Add export.h to drivers/pcmcia as required.Paul Gortmaker2011-10-31
| * pcmcia: add module.h to db1xxx_ss.c since it is modular.Paul Gortmaker2011-10-31
* | ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driverRussell King2011-11-05
* | ARM: PXA: fix lubbock PCMCIA driver build errorRussell King2011-11-05
* | Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-01
|\ \ | |/ |/|