aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAgeFilesLines
* of: Always use 'struct device.of_node' to get device node pointer.Grant Likely2010-05-181-1/+1
* Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/...Linus Torvalds2010-04-061-17/+14
|\
| * pcmcia: fix up alignf issuesDominik Brodowski2010-04-041-17/+14
* | include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-3024-6/+18
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba...Linus Torvalds2010-03-261-8/+4
|\
| * PCI: print resources consistently with %pRBjorn Helgaas2010-03-241-8/+4
* | pcmcia: use dev_pm_ops for class pcmcia_socket_classDominik Brodowski2010-03-2418-282/+66
* | pcmcia: allow for four multifunction subdevices (again)Dominik Brodowski2010-03-241-2/+6
* | pcmcia: do not use ioports < 0x100 on x86Dominik Brodowski2010-03-231-0/+7
* | pd6729: Coding Style fixesKomuro2010-03-231-25/+39
|/
* PCMCIA: resource, fix lock imbalanceJiri Slaby2010-03-161-12/+16
* pcmcia: re-route Cardbus IRQ to ISA on ti1130 bridges if necessaryJens Künzer2010-03-152-13/+49
* pcmcia: allow for cb_irq to differ from pci_dev's irq in yenta_socketJens Künzer2010-03-151-3/+3
* pcmcia: honor saved flags in yenta_socket's I365_CSCINT registerJens Künzer2010-03-152-4/+12
* pcmcia: revert "irq probe can be done without risking an IRQ storm"Dominik Brodowski2010-03-151-8/+0
* pcmcia: pd6729, i82092: use parent (PCI) resourcesDominik Brodowski2010-03-152-0/+2
* pcmcia/vrc4171: use local spinlock for device local lock.Yoichi Yuasa2010-03-151-2/+3
* Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-03-121-5/+20
|\
| * Merge branch 'origin' into devel-stableRussell King2010-03-0829-2824/+3007
| |\
| * | [ARM] sa1111: avoid using hardcoded IRQ numbers for PCMCIA driverEric Miao2010-03-021-5/+20
* | | Driver core: create lock/unlock functions for struct deviceGreg Kroah-Hartman2010-03-071-4/+4
| |/ |/|
* | pcmcia: disable pcmcia ioctl for !ARM, prepare for removalDominik Brodowski2010-03-031-4/+10
* | pcmcia: CodingStyle fixesDominik Brodowski2010-03-033-971/+942
* | pcmcia: alchemy: fixup wrong commentsManuel Lauss2010-03-022-28/+7
* | pcmcia: remove irq_list parameter from pd6729Komuro2010-03-021-17/+1
* | yenta_socket: ENE CB712 CardBus bridge needs special treatment with Echo Audi...Michal Pecio2010-03-021-4/+4
* | 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