aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAge
* Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/fre...Linus Torvalds2010-05-24
|\
| * drivers: Push down BKL into various driversArnd Bergmann2010-05-16
* | Merge remote branch 'origin' into secretlab/next-devicetreeGrant Likely2010-05-22
|\ \
| * | sysfs: add struct file* to bin_attr callbacksChris Wright2010-05-21
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2010-05-20
| |\ \
| | * | pcmcia: disable PCMCIA ioctl also for ARMDominik Brodowski2010-05-17
| | * | pcmcia: remove suspend-related comment from yenta_socket.cDominik Brodowski2010-05-10
| | * | pcmcia: call pcmcia_{read,write}_cis_mem with ops_mutex heldDominik Brodowski2010-05-10
| | * | pcmcia: remove pcmcia_add_device_lockDominik Brodowski2010-05-10
| | * | pcmcia: update gfp/slab.h includesTejun Heo2010-05-10
| | * | pcmcia: do not autoadd root PCI bus resourcesDominik Brodowski2010-05-10
| | * | pcmcia: clarify alloc_io_space, move it to resource handlersDominik Brodowski2010-05-10
| | * | pcmcia: move all pcmcia_resource_ops providers into one moduleDominik Brodowski2010-05-10
| | * | pcmcia: move high level CIS access code to separate fileDominik Brodowski2010-05-10
| | * | pcmcia: dev_node removal (core)Dominik Brodowski2010-05-10
| | * | pcmcia: re-work pcmcia_request_irq()Dominik Brodowski2010-05-10
| | * | pcmcia: pass FORCED_PULSE parameter in pcmcia_request_configuration()Dominik Brodowski2010-05-10
| | * | pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socketDominik Brodowski2010-05-10
| | * | pcmcia: setup IRQ to be used by PCMCIA drivers at card insertDominik Brodowski2010-05-10
| | * | pcmcia: remove unused IRQ modification featureDominik Brodowski2010-05-10
| | |/
| * / [ARM] pxa: add support for Voipac PXA270 PCMCIAMarek Vasut2010-05-11
| |/
| * Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/...Linus Torvalds2010-05-07
| |\
| | * pcmcia: fix compilation after 16bit state locking changesMarc Zyngier2010-05-04
| | * pcmcia: order userspace suspend and resume requestsDominik Brodowski2010-05-04
| | * pcmcia: avoid pccard_validate_cis failure in resume callpathDominik Brodowski2010-05-03
| * | MIPS: DB1200: PCMCIA card detection must not be auto-enabled.Manuel Lauss2010-04-30
| |/
| * pcmcia: fix matching rules for pseudo-multi-function cardsAlexander Kurz2010-04-26
| * pcmcia: pcmcia_dev_present bugfixDominik Brodowski2010-04-21
| * drivers/pcmcia: Add missing local_irq_restoreJulia Lawall2010-04-17
| * pcmcia: avoid late calls to pccard_validate_cisDominik Brodowski2010-04-17
| * pcmcia: fix ioport size calculation in rsrc_nonstaticDominik Brodowski2010-04-15
| * pcmcia: re-start on MFC overrideDominik Brodowski2010-04-11
| * pcmcia: fix io_probe due to parent (PCI) resourcesDominik Brodowski2010-04-11
| * pcmcia: use previously assigned IRQ for all card functionsDominik Brodowski2010-04-11
* | of: Remove duplicate fields from of_platform_driverGrant Likely2010-05-22
* | of: Always use 'struct device.of_node' to get device node pointer.Grant Likely2010-05-18
|/
* Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/...Linus Torvalds2010-04-06
|\
| * pcmcia: fix up alignf issuesDominik Brodowski2010-04-04
* | include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-30
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba...Linus Torvalds2010-03-26
|\
| * PCI: print resources consistently with %pRBjorn Helgaas2010-03-24
* | pcmcia: use dev_pm_ops for class pcmcia_socket_classDominik Brodowski2010-03-24
* | pcmcia: allow for four multifunction subdevices (again)Dominik Brodowski2010-03-24
* | pcmcia: do not use ioports < 0x100 on x86Dominik Brodowski2010-03-23
* | pd6729: Coding Style fixesKomuro2010-03-23
|/
* PCMCIA: resource, fix lock imbalanceJiri Slaby2010-03-16
* pcmcia: re-route Cardbus IRQ to ISA on ti1130 bridges if necessaryJens Künzer2010-03-15
* pcmcia: allow for cb_irq to differ from pci_dev's irq in yenta_socketJens Künzer2010-03-15
* pcmcia: honor saved flags in yenta_socket's I365_CSCINT registerJens Künzer2010-03-15
* pcmcia: revert "irq probe can be done without risking an IRQ storm"Dominik Brodowski2010-03-15