summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | 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
| * | | | | PCMCIA: sa11x0: simpad: convert to use new irq/gpio managementRussell King2012-02-211-18/+8
| * | | | | PCMCIA: sa11x0: shannon: convert to use new irq/gpio managementRussell King2012-02-211-37/+17
| * | | | | PCMCIA: sa11x0: nanoengine: convert reset handling to use GPIO subsystemRussell King2012-02-041-22/+16
| * | | | | PCMCIA: sa11x0: nanoengine: convert to use new irq/gpio managementRussell King2012-02-041-90/+11
| * | | | | PCMCIA: sa11x0: cerf: convert reset handling to use GPIO subsystemRussell King2012-02-041-5/+14
| * | | | | PCMCIA: sa11x0: cerf: convert to use new irq/gpio managementRussell King2012-02-041-33/+9
| * | | | | PCMCIA: sa11x0: assabet: convert to use new irq/gpio managementRussell King2012-02-041-49/+15
| * | | | | PCMCIA: sa1111: use new per-socket irq/gpio infrastructureRussell King2012-02-046-52/+13
| * | | | | PCMCIA: pxa: convert PXA socket drivers to use new irq/gpio managementRussell King2012-02-0414-355/+81
| * | | | | PCMCIA: soc_common: add GPIO support for card status signalsRussell King2012-01-262-3/+127
| * | | | | PCMCIA: soc_common: move common initialization into soc_commonRussell King2012-01-265-12/+15
* | | | | | Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2012-03-231-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | PCI: Rename pci_remove_behind_bridge to pci_stop_and_remove_behind_bridgeYinghai Lu2012-02-271-1/+1
| |/ / / /
* | | | | Merge 3.3-rc6 into driver-core-nextGreg Kroah-Hartman2012-03-092-12/+4
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probeAxel Lin2012-02-161-9/+3
| | |/ / | |/| |
| * | | pcmcia: fix socket refcount decrementing on each resumeRussell King2012-02-081-3/+1
| | |/ | |/|
* | | Merge 3.3-rc2 into the driver-core-next branch.Greg Kroah-Hartman2012-02-021-1/+2
|\ \ \ | |/ /
| * | PCMCIA: fix sa1111 oops on removeRussell King2012-01-241-1/+2
| |/
* | USB/PCI/PCMCIA: Clean up new_id and remove_id sysfs attribute routinesAlan Stern2012-01-261-0/+6
* | Dynamic ID addition doesn't need get_driver()Alan Stern2012-01-241-4/+1
|/
* Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-01-146-988/+24
|\
| * MIPS: Alchemy: Basic support for the DB1300 board.Manuel Lauss2011-12-072-6/+24
| * MIPS: Alchemy: remove PB1000 supportManuel Lauss2011-12-075-982/+0
* | module_param: make bool parameters really bool (drivers & misc)Rusty Russell2012-01-131-3/+3
* | pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()Axel Lin2011-12-286-12/+18
* | driver: pcmcia: replace IRQ_GPIO() with gpio_to_irq()Haojian Zhuang2011-11-152-13/+12
|/
* Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-063-0/+3
|\
| * pcmcia: Add export.h to drivers/pcmcia as required.Paul Gortmaker2011-10-312-0/+2
| * pcmcia: add module.h to db1xxx_ss.c since it is modular.Paul Gortmaker2011-10-311-0/+1
* | ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driverRussell King2011-11-051-2/+1
* | ARM: PXA: fix lubbock PCMCIA driver build errorRussell King2011-11-051-0/+1
* | Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-1/+1
|\ \ | |/ |/|
| * Merge branch 'depends/rmk/gpio' into next/fixesArnd Bergmann2011-10-311-1/+1
| |\
| * | ARM: pxa: use correct __iomem annotationsArnd Bergmann2011-10-081-1/+1
* | | Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds2011-10-271-1/+1
|\ \ \ | | |/ | |/|
| * | ARM: gpio: pxa: convert drivers to use asm/gpio.h rather than mach/gpio.hRussell King2011-08-081-1/+1
| |/
* | ARM: 7024/1: simpad: Cleanup CS3 accessors.Jochen Friedrich2011-10-171-19/+16
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2011-07-3111-122/+15
|\
| * pxa2xx pcmcia - stargate 2 use gpio array.Jonathan Cameron2011-07-291-23/+11
OpenPOWER on IntegriCloud