summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAgeFilesLines
* 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
| * pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.Jonathan Cameron2011-07-299-96/+0
| * drivers:pcmcia:soc_common: make socket_init and socket_suspend optionalJonathan Cameron2011-07-291-3/+4
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-07-254-12/+11
|\ \
| * \ Merge branch 'master' into for-nextJiri Kosina2011-07-111-0/+1
| |\ \
| * | | treewide: Convert uses of struct resource to resource_size(ptr)Joe Perches2011-06-104-12/+11
* | | | Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-07-252-7/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | pcmcia: pxa2xx/trizeps4: remove unnecessary ifdefsJonathan Cameron2011-07-111-4/+0
| * | | ARM: scoop: drop pcmcia_init callbackDmitry Eremin-Solenikov2011-07-111-3/+0
| | |/ | |/|
* | | pcmcia: pxa2xx/vpac270: free gpios on exist rather than requestingJonathan Cameron2011-07-111-2/+2
|/ /
* | gpio: include linux/gpio.h where neededRandy Dunlap2011-06-161-0/+1
|/
* pcmcia: Make declaration and uses of struct pcmcia_device_id constJoe Perches2011-05-061-3/+3
* pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.dataUwe Kleine-König2011-05-061-1/+1
* Revert wrong fixes for common misspellingsLucas De Marchi2011-04-261-1/+1
* ARM: pxa: convert incorrect IRQ_TO_IRQ() to irq_to_gpio()Eric Miao2011-04-131-6/+6
* pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platformDmitry Eremin-Solenikov2011-04-121-0/+3
* pcmcia: limit pxa2xx_balloon3 subdriver to balloon3 platformDmitry Eremin-Solenikov2011-04-121-0/+5
* Fix common misspellingsLucas De Marchi2011-03-314-4/+4
* Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-03-305-303/+114
|\
| * Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/...Russell King2011-03-265-303/+114
| |\
| | * ARM: pxa: Update copyright notices for Palm devicesMarek Vasut2011-03-164-5/+4
| | * ARM: pxa: Use gpio arrays in vpac270_pcmcia driverMarek Vasut2011-03-161-78/+29
| | * ARM: pxa: Use gpio arrays in palmtx_pcmcia driverMarek Vasut2011-03-161-44/+11
| | * ARM: pxa: Use gpio arrays in palmtc_pcmcia driverMarek Vasut2011-03-161-61/+12
| | * ARM: pxa: Use gpio arrays in palmld_pcmcia driverMarek Vasut2011-03-161-31/+9
| | * ARM: pxa: Use gpio arrays in colibri_pcmcia driverMarek Vasut2011-03-161-84/+49
* | | drivers: Final irq namespace conversionThomas Gleixner2011-03-295-11/+11
|/ /
* | Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2011-03-162-10/+8
|\ \ | |/ |/|
| * dt: Eliminate of_platform_{,un}register_driverGrant Likely2011-02-282-10/+8
* | Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-03-071-0/+3
|\ \
| * | ARM: pxa/colibri: don't register pxa2xx-pcmcia nodes on non-colibri platformsDmitry Eremin-Solenikov2011-02-271-0/+3
| |/
* | pcmcia: re-enable Zoomed Video supportDominik Brodowski2011-02-201-0/+2
* | pcmcia vs. MECR on pxa25x/sa1111Pavel Machek2011-02-193-1/+3
|/
* kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes2011-01-201-6/+6
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2011-01-133-3/+3
|\
| * Merge branch 'master' into for-nextJiri Kosina2010-12-2210-14/+20
| |\
| * | tree-wide: fix comment/printk typosUwe Kleine-König2010-11-013-3/+3
* | | Merge branch 'devel-stable' into develRussell King2011-01-066-20/+292
|\ \ \
OpenPOWER on IntegriCloud