aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-10-119-41/+825
|\
| * Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.gitRussell King2008-10-091-1/+5
| |\
| * | [ARM] pxa: allow multi-machine PCMCIA buildsRussell King2008-10-071-9/+11
| * | Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-armRussell King2008-10-074-24/+204
| |\ \
| | * | Add support for the Arcom/Eurotech Viper SBC CompactFlash card slotMarc Zyngier2008-09-094-23/+203
| * | | Merge branch 'pxa-palm' into pxa-machinesRussell King2008-10-072-1/+153
| |\ \ \
| | * | | [ARM] 5199/1: PalmLD: PCMCIA driverMarek Vašut2008-08-162-1/+153
| | |/ /
| * | | Merge branch 'pxa-trizeps' into pxa-machinesRussell King2008-10-073-1/+258
| |\ \ \
| | * | | [ARM] pxa: trizeps4: remove unused variableRussell King2008-10-071-1/+0
| | * | | [ARM] 5294/1: Trizeps4 PCMCIA supportJürgen Schindele2008-10-073-1/+259
| | |/ /
| * | | [ARM] 5283/1: pxa: add CM-X255 pcmcia supportMike Rapoport2008-10-074-13/+206
| |/ /
* | | pcmcia: Fix broken abuse of dev->driver_dataAlan Cox2008-09-221-9/+14
| |/ |/|
* | [ARM] 5245/1: Fix warning about unused return value in drivers/pcmciaJürgen Schindele2008-09-131-1/+5
|/
* [ARM] 5198/1: PalmTX: PCMCIA fixesMarek Vašut2008-08-161-2/+47
* [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/machRussell King2008-08-0719-38/+38
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixesRussell King2008-08-071-1/+1
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6Linus Torvalds2008-08-041-1/+1
| |\
| | * pcmcia: rsrc_nonstatic: check value, not pointerDominik Brodowski2008-07-281-1/+1
* | | [ARM] Remove asm/hardware.h, use asm/arch/hardware.h insteadRussell King2008-08-0717-17/+17
|/ /
* | [ARM] 5179/1: Replace obsolete IRQT_* and __IRQT_* values with IRQ_TYPE_*Dmitry Baryshkov2008-07-271-6/+6
* | PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architecturesAndrea Righi2008-07-241-0/+1
* | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-07-234-67/+148
|\ \ | |/ |/|
| * Merge branch 'pxa' into develRussell King2008-07-136-80/+175
| |\
| | *-. Merge branches 'pxa-ian' and 'pxa-xm270' into pxaRussell King2008-07-121-66/+27
| | |\ \
| | | | * [ARM] 5104/1: CM-X270: PCMCIA updatesMike Rapoport2008-07-091-66/+27
| | | |/
| | * | [ARM] 5154/1: PalmTX PCMCIAMarek Vašut2008-07-103-1/+121
| | * | Merge branch 'machtypes' into pxa-palmRussell King2008-07-091-0/+1
| | |\ \ | | | |/ | | |/|
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6Linus Torvalds2008-07-171-1/+1
|\ \ \ \
| * | | | pcmcia: fix cisinfo_t removalMarc Zyngier2008-07-151-1/+1
* | | | | Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-buildBenjamin Herrenschmidt2008-07-1528-312/+652
|\ \ \ \ \
| * \ \ \ \ Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-07-144-25/+40
| |\ \ \ \ \
| | * \ \ \ \ [ARM] Merge most of the PXA work for initial mergeRussell King2008-07-143-13/+27
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | / / | | | | |/ / | | | |/| |
| | | * | | [ARM] pxa: avoid kfreeing static data if platform device fails to registerRussell King2008-06-023-13/+19
| | | * | | [ARM] pxa: avoid registering multiple pxa2xx_pcmcia devicesRussell King2008-06-022-0/+8
| | * | | | ARM: OMAP: Change omap_cf.c and omap_nor.c to use omap_readw/writew instead o...Tony Lindgren2008-07-031-12/+13
| | | |_|/ | | |/| |
| * | | | Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6Linus Torvalds2008-07-141-7/+18
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge commit 'v2.6.26' into bkl-removalJonathan Corbet2008-07-141-0/+1
| | |\ \ \ | | | |/ /
| | * | | pcmcia: cdev lock_kernel() pushdownJonathan Corbet2008-05-181-7/+18
| | | |/ | | |/|
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2008-07-1424-280/+594
| |\ \ \ | | |_|/ | |/| |
| | * | pcmcia: allow for longer CIS firmware filesDominik Brodowski2008-06-241-2/+2
| | * | pcmcia: (re)move {pcmcia,pccard}_get_statusDominik Brodowski2008-06-243-69/+61
| | * | pcmcia: kill IN_CARD_SERVICESAdrian Bunk2008-06-246-6/+0
| | * | pcmcia: remove unused bulkmem.hMagnus Damm2008-06-2413-24/+0
| | * | pcmcia: simplify pccard_validate_cisDominik Brodowski2008-06-245-19/+22
| | * | pcmcia: carve out ioctl adjust function to pcmcia_ioctlDominik Brodowski2008-06-243-100/+94
| | * | pcmcia: irq probe can be done without risking an IRQ stormAlan Cox2008-06-241-0/+9
| | * | pcmcia: Fix ti12xx_2nd_slot_empty always failingAlex Harford2008-06-241-1/+1
| | * | pcmcia: check for pointer instead of pointer addressDominik Brodowski2008-06-241-1/+1
| | * | pcmcia: simplify rsrc_nonstatic attributesDavid Brownell2008-06-241-17/+10
| | * | pcmcia: add support CompactFlash PCMCIA support for Blackfin.Michael Hennerich2008-06-243-0/+347