aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2010-02-279-643/+1003
|\
| * MIPS: Alchemy: use 36bit addresses for PCMCIA resources.Manuel Lauss2010-02-274-45/+23
| * MIPS: Alchemy: XXS1500 PCMCIA driver rewriteManuel Lauss2010-02-274-189/+369
| * MIPS: PCMCIA: new socket driver for Au1000 demoboards.Manuel Lauss2010-02-276-444/+644
| * MIPS: Alchemy: devboard register abstractionManuel Lauss2010-02-271-37/+39
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2010-02-2721-1228/+1108
|\ \ | |/ |/|
| * pcmcia: validate late-added resourcesDominik Brodowski2010-02-251-19/+48
| * pcmcia: allow for extension of resource intervalDominik Brodowski2010-02-171-2/+4
| * pcmcia: remove useless msleep in ds.cDominik Brodowski2010-02-172-6/+3
| * pcmcia: use read_cis_mem return valueDominik Brodowski2010-02-171-19/+44
| * pcmcia: add locking to pcmcia_{read,write}_cis_memDominik Brodowski2010-02-172-6/+26
| * pcmcia: avoid prod_id memleakDominik Brodowski2010-02-171-5/+14
| * pcmcia: avoid sysfs-related lockup for cardbusDominik Brodowski2010-02-171-2/+10
| * pcmcia: use state machine for extended requeryDominik Brodowski2010-02-171-70/+22
| * pcmcia: delay re-scanning and re-querying of PCMCIA busDominik Brodowski2010-02-175-53/+59
| * pcmcia: use pccardd to handle eject, insert, suspend and resume requestsDominik Brodowski2010-02-174-140/+81
| * pcmcia: use ops_mutex for rsrc_{mgr,nonstatic} lockingDominik Brodowski2010-02-175-34/+20
| * pcmcia: use mutex for dynid lockDominik Brodowski2010-02-171-8/+8
| * pcmcia: assert locking to struct pcmcia_deviceDominik Brodowski2010-02-172-56/+104
| * pcmcia: simplify lockingDominik Brodowski2010-02-176-74/+47
| * pcmcia: add locking to struct pcmcia_socket->pcmcia_state()Dominik Brodowski2010-02-171-3/+30
| * pcmcia: protect s->device_countDominik Brodowski2010-02-171-7/+18
| * pcmcia: properly lock skt->irq, skt->irq_maskDominik Brodowski2010-02-172-0/+5
| * pcmcia: lock ops->set_socketDominik Brodowski2010-02-172-4/+29
| * pcmcia: lock ops->set_io_map()Dominik Brodowski2010-02-171-0/+10
| * pcmcia: also lock fake and cache CIS by ops_mutexDominik Brodowski2010-02-172-1/+23
| * pcmcia: add locking to set_mem_map()Dominik Brodowski2010-02-174-5/+30
| * pcmcia/i82365: fix typos in commentsWolfram Sang2010-02-171-2/+2
| * pcmcia/omap_cf: don't redefine SZ_2KUwe Kleine-König2010-02-171-2/+0
| * pcmcia/at91_cf: don't redefine SZ_2KUwe Kleine-König2010-02-171-2/+0
| * pcmcia/bfin_cf: don't check platform_get_irq's return value against zeroUwe Kleine-König2010-02-171-1/+1
| * pcmcia/yenta: add module parameter for O2 speedupsWolfram Sang2010-02-172-16/+34
| * pcmcia: make Open Firmware device id constantMárton Németh2010-02-172-2/+2
| * pcmcia: fix yenta dependency on PCCARD_NONSTATICMichal Marek2010-02-171-3/+3
| * pcmcia: do not use resource manager on !PCMCIADominik Brodowski2010-02-171-2/+2
| * pcmcia: remove remaining rsrc_mgr indirectionsDominik Brodowski2010-02-173-28/+23
| * pcmcia: move cistpl.c into pcmcia moduleDominik Brodowski2010-02-176-187/+183
| * pcmcia: m8xx_pcmcia.c should use iodyn resource managerDominik Brodowski2010-02-172-2/+1
| * pcmcia: m32r uses static socket resourcesDominik Brodowski2010-01-242-3/+1
| * pcmcia: remove some rsrc_mgr indirectionsDominik Brodowski2010-01-243-26/+17
| * pcmcia: remove useless indirectionDominik Brodowski2010-01-243-10/+2
| * pcmcia: do not lock socket driver module on card insertDominik Brodowski2010-01-242-23/+10
| * pcmcia: do not lock socket driver module in pcmcia_get_socket()Dominik Brodowski2010-01-171-7/+1
| * pcmcia: rsrc_nonstatic io memory probe improvementsDominik Brodowski2010-01-171-60/+114
| * pcmcia: call CIS cleanup from ds.cDominik Brodowski2010-01-172-3/+3
| * pcmcia: CardBus doesn't need CIS accessDominik Brodowski2010-01-172-329/+46
| * pcmcia: improve check for same card in slot after resumeDominik Brodowski2010-01-173-36/+46
| * pcmcia: cleanup pccard_validate_cis()Dominik Brodowski2010-01-171-74/+81
| * pcmcia: validate CIS, not CIS cache.Dominik Brodowski2010-01-173-10/+21
| * pcmcia: do not meddle with already assigned resourcesDominik Brodowski2010-01-171-7/+0