summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
AgeCommit message (Expand)AuthorFilesLines
2011-11-06Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds3-0/+3
2011-11-05ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driverRussell King1-2/+1
2011-11-05ARM: PXA: fix lubbock PCMCIA driver build errorRussell King1-0/+1
2011-11-01Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds1-1/+1
2011-10-31pcmcia: Add export.h to drivers/pcmcia as required.Paul Gortmaker2-0/+2
2011-10-31pcmcia: add module.h to db1xxx_ss.c since it is modular.Paul Gortmaker1-0/+1
2011-10-31Merge branch 'depends/rmk/gpio' into next/fixesArnd Bergmann1-1/+1
2011-10-27Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds1-1/+1
2011-10-17ARM: 7024/1: simpad: Cleanup CS3 accessors.Jochen Friedrich1-19/+16
2011-10-08ARM: pxa: use correct __iomem annotationsArnd Bergmann1-1/+1
2011-08-08ARM: gpio: pxa: convert drivers to use asm/gpio.h rather than mach/gpio.hRussell King1-1/+1
2011-07-31Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds11-122/+15
2011-07-29pxa2xx pcmcia - stargate 2 use gpio array.Jonathan Cameron1-23/+11
2011-07-29pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.Jonathan Cameron9-96/+0
2011-07-29drivers:pcmcia:soc_common: make socket_init and socket_suspend optionalJonathan Cameron1-3/+4
2011-07-25Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds4-12/+11
2011-07-25Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2-7/+0
2011-07-11Merge branch 'master' into for-nextJiri Kosina1-0/+1
2011-07-11pcmcia: pxa2xx/trizeps4: remove unnecessary ifdefsJonathan Cameron1-4/+0
2011-07-11ARM: scoop: drop pcmcia_init callbackDmitry Eremin-Solenikov1-3/+0
2011-07-11pcmcia: pxa2xx/vpac270: free gpios on exist rather than requestingJonathan Cameron1-2/+2
2011-06-16gpio: include linux/gpio.h where neededRandy Dunlap1-0/+1
2011-06-10treewide: Convert uses of struct resource to resource_size(ptr)Joe Perches4-12/+11
2011-05-06pcmcia: Make declaration and uses of struct pcmcia_device_id constJoe Perches1-3/+3
2011-05-06pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.dataUwe Kleine-König1-1/+1
2011-04-26Revert wrong fixes for common misspellingsLucas De Marchi1-1/+1
2011-04-13ARM: pxa: convert incorrect IRQ_TO_IRQ() to irq_to_gpio()Eric Miao1-6/+6
2011-04-12pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platformDmitry Eremin-Solenikov1-0/+3
2011-04-12pcmcia: limit pxa2xx_balloon3 subdriver to balloon3 platformDmitry Eremin-Solenikov1-0/+5
2011-03-31Fix common misspellingsLucas De Marchi4-4/+4
2011-03-30Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds5-303/+114
2011-03-29drivers: Final irq namespace conversionThomas Gleixner5-11/+11
2011-03-26Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/...Russell King5-303/+114
2011-03-16Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2-10/+8
2011-03-16ARM: pxa: Update copyright notices for Palm devicesMarek Vasut4-5/+4
2011-03-16ARM: pxa: Use gpio arrays in vpac270_pcmcia driverMarek Vasut1-78/+29
2011-03-16ARM: pxa: Use gpio arrays in palmtx_pcmcia driverMarek Vasut1-44/+11
2011-03-16ARM: pxa: Use gpio arrays in palmtc_pcmcia driverMarek Vasut1-61/+12
2011-03-16ARM: pxa: Use gpio arrays in palmld_pcmcia driverMarek Vasut1-31/+9
2011-03-16ARM: pxa: Use gpio arrays in colibri_pcmcia driverMarek Vasut1-84/+49
2011-03-07Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds1-0/+3
2011-02-28dt: Eliminate of_platform_{,un}register_driverGrant Likely2-10/+8
2011-02-27ARM: pxa/colibri: don't register pxa2xx-pcmcia nodes on non-colibri platformsDmitry Eremin-Solenikov1-0/+3
2011-02-20pcmcia: re-enable Zoomed Video supportDominik Brodowski1-0/+2
2011-02-19pcmcia vs. MECR on pxa25x/sa1111Pavel Machek3-1/+3
2011-01-20kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes1-6/+6
2011-01-13Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds3-3/+3
2011-01-06Merge branch 'devel-stable' into develRussell King6-20/+292
2011-01-05Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'ver...Russell King5-61/+293
2010-12-22Merge branch 'master' into for-nextJiri Kosina10-14/+20