aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/fre...Linus Torvalds2010-05-241-3/+14
|\
| * drivers: Push down BKL into various driversArnd Bergmann2010-05-171-3/+14
* | Merge remote branch 'origin' into secretlab/next-devicetreeGrant Likely2010-05-2218-864/+1192
|\ \
| * | sysfs: add struct file* to bin_attr callbacksChris Wright2010-05-211-2/+2
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2010-05-2016-789/+893
| |\ \
| | * | pcmcia: disable PCMCIA ioctl also for ARMDominik Brodowski2010-05-171-20/+0
| | * | pcmcia: remove suspend-related comment from yenta_socket.cDominik Brodowski2010-05-101-7/+0
| | * | pcmcia: call pcmcia_{read,write}_cis_mem with ops_mutex heldDominik Brodowski2010-05-103-19/+19
| | * | pcmcia: remove pcmcia_add_device_lockDominik Brodowski2010-05-101-16/+2
| | * | pcmcia: update gfp/slab.h includesTejun Heo2010-05-102-0/+2
| | * | pcmcia: do not autoadd root PCI bus resourcesDominik Brodowski2010-05-101-6/+29
| | * | pcmcia: clarify alloc_io_space, move it to resource handlersDominik Brodowski2010-05-105-99/+195
| | * | pcmcia: move all pcmcia_resource_ops providers into one moduleDominik Brodowski2010-05-106-117/+141
| | * | pcmcia: move high level CIS access code to separate fileDominik Brodowski2010-05-104-330/+356
| | * | pcmcia: dev_node removal (core)Dominik Brodowski2010-05-102-14/+3
| | * | pcmcia: re-work pcmcia_request_irq()Dominik Brodowski2010-05-102-85/+55
| | * | pcmcia: pass FORCED_PULSE parameter in pcmcia_request_configuration()Dominik Brodowski2010-05-101-8/+3
| | * | pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socketDominik Brodowski2010-05-106-27/+14
| | * | pcmcia: setup IRQ to be used by PCMCIA drivers at card insertDominik Brodowski2010-05-103-94/+137
| | * | pcmcia: remove unused IRQ modification featureDominik Brodowski2010-05-101-13/+3
| | |/
| * | [ARM] pxa: add support for Voipac PXA270 PCMCIAMarek Vasut2010-05-113-1/+232
| |/
| * Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/...Linus Torvalds2010-05-073-13/+11
| |\
| | * pcmcia: fix compilation after 16bit state locking changesMarc Zyngier2010-05-041-6/+1
| | * pcmcia: order userspace suspend and resume requestsDominik Brodowski2010-05-041-7/+9
| | * pcmcia: avoid pccard_validate_cis failure in resume callpathDominik Brodowski2010-05-031-0/+1
| * | MIPS: DB1200: PCMCIA card detection must not be auto-enabled.Manuel Lauss2010-04-301-12/+4
| |/
| * pcmcia: fix matching rules for pseudo-multi-function cardsAlexander Kurz2010-04-261-3/+4
| * pcmcia: pcmcia_dev_present bugfixDominik Brodowski2010-04-211-33/+14
| * drivers/pcmcia: Add missing local_irq_restoreJulia Lawall2010-04-171-1/+3
| * pcmcia: avoid late calls to pccard_validate_cisDominik Brodowski2010-04-171-2/+7
| * pcmcia: fix ioport size calculation in rsrc_nonstaticDominik Brodowski2010-04-151-1/+3
| * pcmcia: re-start on MFC overrideDominik Brodowski2010-04-111-8/+14
| * pcmcia: fix io_probe due to parent (PCI) resourcesDominik Brodowski2010-04-111-3/+9
| * pcmcia: use previously assigned IRQ for all card functionsDominik Brodowski2010-04-111-5/+5
* | of: Remove duplicate fields from of_platform_driverGrant Likely2010-05-222-4/+10
* | 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