summaryrefslogtreecommitdiff
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2010-02-2747-1959/+2682
|\
| * MIPS: Alchemy: use 36bit addresses for PCMCIA resources.Manuel Lauss2010-02-274-45/+23
| * Staging: Octeon: Remove /proc/octeon_ethernet_statsDavid Daney2010-02-274-178/+0
| * Staging: Octeon: Reformat a bunch of comments.David Daney2010-02-277-71/+44
| * Staging: Octeon: Free transmit SKBs in a timely mannerDavid Daney2010-02-276-63/+142
| * Staging: Octeon: Run phy bus accesses on a workqueue.David Daney2010-02-273-63/+109
| * Staging: octeon: remove unneeded includesDavid Daney2010-02-276-6/+0
| * MMC: AU1xMMC: Allow platforms to disable host capabilitiesManuel Lauss2010-02-271-0/+4
| * MIPS: AR7: Implement clock APIFlorian Fainelli2010-02-272-4/+24
| * MIPS: Loongson: Change the Email address of Wu ZhangjinWu Zhangjin2010-02-274-4/+4
| * Staging: Octeon Ethernet: Use constants from in.hDavid Daney2010-02-272-7/+4
| * Staging: Octeon Ethernet: Enable scatter-gather.David Daney2010-02-272-9/+55
| * Staging: Octeon Ethernet: Convert to NAPI.David Daney2010-02-275-163/+235
| * Staging: Octeon Ethernet: Rewrite transmit code.David Daney2010-02-275-123/+150
| * Staging: Octeon Ethernet: Fix memory allocation.David Daney2010-02-272-20/+31
| * Staging: Octeon Ethernet: Remove unused code.David Daney2010-02-276-284/+55
| * MIPS: I2C: Add driver for Cavium OCTEON I2C ports.Rade Bozic2010-02-273-0/+662
| * NET: au1000-eth: Convert to platform_driver modelFlorian Fainelli2010-02-272-218/+232
| * MIPS: Alchemy: physmap-flash for all devboardsManuel Lauss2010-02-273-173/+0
| * SERIAL 8250: Fixes for Alchemy UARTs.Manuel Lauss2010-02-271-7/+8
| * MIPS: Alchemy: change dbdma to accept physical memory addressesManuel Lauss2010-02-273-8/+8
| * MIPS: Alchemy: remove dbdma compat macrosManuel Lauss2010-02-273-16/+15
| * 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-273-47/+47
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2010-02-2724-1236/+1115
|\ \
| * | 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: handle error in serial_cs config callsDominik Brodowski2010-02-171-3/+4
| * | 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