summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | pcmcia: remove version.hDominik Brodowski2008-06-241-1/+0
| | * | pcmcia: cs: kill thread_waitChristoph Hellwig2008-06-241-9/+3
| | * | pcmcia: i82365.c: check request_irq return valueLeonardo Potenza2008-06-241-12/+27
| | * | pcmcia: fix Alchemy warningsSergei Shtylyov2008-06-241-11/+15
| | * | pcmcia: remove CVS keywordsAdrian Bunk2008-06-243-6/+0
| | * | pcmcia: yenta-cardbus: ENE_TEST_C9_PFENABLE duplicate *_F0Roel Kluin2008-06-241-1/+1
| | * | pcmcia: Update email address for m8xx driver authorMagnus Damm2008-06-241-1/+1
| | |/
* | | pcmcia: Use linux/of_{device,platform}.h instead of asmStephen Rothwell2008-06-302-3/+3
|/ /
* | electra_cf: Add MODULE_DEVICE_TABLE()Olof Johansson2008-05-271-0/+1
|/
* pcmcia: replace remaining __FUNCTION__ occurrencesHarvey Harrison2008-05-0114-35/+35
* drivers/pcmcia/soc_common.c: convert soc_pcmcia_sockets_lock into a mutex and...Andrew Morton2008-05-012-8/+8
* Alchemy Semi Au1000 pcmcia driver: convert pcmcia_sockets_lock in a mutexMatthias Kaehlcke2008-05-011-5/+6
* pcmcia: annotate cb_alloc with __refSam Ravnborg2008-05-011-1/+1
* pcmcia: silence section mismatch warnings from pci_driver variablesSam Ravnborg2008-05-012-6/+6
* pcmcia: silence section mismatch warnings from class_interface variablesSam Ravnborg2008-05-012-2/+2
* pcmcia: remove pccard_sysfs_interface warningsDavid Brownell2008-04-303-40/+28
* drivers/pcmcia/pcmcia_ioctl.c: fix buildakpm@linux-foundation.org2008-04-291-2/+2
* pcmcia: use get/put_unaligned_* helpersHarvey Harrison2008-04-291-24/+15
* ARM: always select HAVE_IDEAdrian Bunk2008-04-281-1/+0
* [ARM] pxa: fix 0e623941bec7e80c97b076d346327b31ae17d84aRussell King2008-04-211-1/+1
* Merge branch 'merge-fixes' into develRussell King2008-04-193-0/+5
|\
OpenPOWER on IntegriCloud