summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge 4.0-rc5 into char-misc-nextGreg Kroah-Hartman2015-03-253-183/+3
|\ \
| * | Revert "pcmcia: add a new resource manager for non ISA systems"Greg Kroah-Hartman2015-03-113-182/+3
| * | Revert "pcmcia: fix incorrect bracketing on a test"Greg Kroah-Hartman2015-03-111-1/+1
| * | Revert "pcmcia: add missing include for new pci resource handler"Greg Kroah-Hartman2015-03-111-1/+0
| |/
* | pcmcia: Use setup_timer and mod_timerVaishali Thakkar2015-03-162-10/+6
* | pcmcia: Use setup_timerVaishali Thakkar2015-03-162-6/+3
|/
* Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2015-02-171-0/+1
|\
| * pcmcia: at91_cf: depend on !ARCH_MULTIPLATFORMAlexandre Belloni2015-01-291-0/+1
* | pcmcia: fix incorrect bracketing on a testAlan2015-01-251-1/+1
* | pcmcia: add missing include for new pci resource handlerArnd Bergmann2015-01-131-0/+1
* | pcmcia: add a new resource manager for non ISA systemsAlan Cox2015-01-123-3/+182
* | pcmcia: handle anonymous cards by generating a fake CISAlan Cox2015-01-121-4/+20
* | pcmcia: Fix requeryAlan Cox2015-01-122-1/+4
* | pcmcia cis: on an out of range CIS read return 0xff, don't just warnAlan Cox2015-01-121-1/+4
* | pcmcia: correct typesAlan Cox2015-01-122-5/+6
|/
* Merge tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2014-12-144-7/+6
|\
| * pcmcia: sa1111: pass sa1111_dev to jornada720 codeDmitry Eremin-Solenikov2014-11-073-4/+3
| * pcmcia: sa1111: pass sa1111_dev to badge4-specific codeDmitry Eremin-Solenikov2014-11-073-3/+3
* | Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2014-12-1414-14/+0
|\ \
| * | pcmcia: drop owner assignment from platform_driversWolfram Sang2014-10-2014-14/+0
| |/
* | Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-armLinus Torvalds2014-12-124-2/+24
|\ \
| * | ARM: 8247/2: pcmcia: sa1100: make use of device clockDmitry Eremin-Solenikov2014-12-052-2/+13
| * | ARM: 8246/2: pcmcia: sa1111: provide device clockDmitry Eremin-Solenikov2014-12-051-0/+7
| * | ARM: 8245/1: pcmcia: soc-common: enable/disable socket clocksDmitry Eremin-Solenikov2014-12-051-0/+4
| |/
* | PCMCIA: Alchemy Don't select 64BIT_PHYS_ADDR in Kconfig.Ralf Baechle2014-11-241-2/+0
|/
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2014-08-073-1179/+0
|\
| * pcmcia: Remove m8xx_pcmcia driverScott Wood2014-06-253-1179/+0
* | pcmcia: remove DEFINE_PCI_DEVICE_TABLE usageGreg Kroah-Hartman2014-07-185-5/+5
* | pcmcia: journada720: use sa1100 pin interfaces correctlyArnd Bergmann2014-07-091-4/+6
* | pcmcia: pxa2xx: fix logic for lubbockArnd Bergmann2014-07-091-1/+1
* | pcmcia: sa1100: H3100 and H3600 share a driverArnd Bergmann2014-07-091-0/+1
|/
* pcmcia: Use pci_is_bridge() to simplify codeYijing Wang2014-05-271-2/+1
* Merge tag 'pci-v3.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2014-04-011-9/+9
|\
| * pcmcia: Use list_for_each_entry() for bus traversalYijing Wang2014-02-141-9/+9
* | cpufreq: remove unused notifier: CPUFREQ_{SUSPENDCHANGE|RESUMECHANGE}Viresh Kumar2014-03-191-3/+0
|/
* Merge tag 'pci-v3.14-changes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2014-01-223-4/+11
|\
| * pcmcia: Use global PCI rescan-remove lockingRafael J. Wysocki2014-01-141-0/+7
| * PCI: Convert pcibios_resource_to_bus() to take a pci_bus, not a pci_devYinghai Lu2013-12-212-4/+4
* | pcmcia: Remove superfluous name castsGeert Uytterhoeven2013-12-082-2/+2
|/
* Merge tag 'devicetree-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2013-11-122-0/+4
|\
| * powerpc: add missing explicit OF includes for ppcRob Herring2013-11-111-0/+2
| * drivers: clean-up prom.h implicit includesRob Herring2013-10-091-0/+2
* | Merge tag 'driver-core-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2013-11-072-32/+44
|\ \
| * | pcmcia: convert bus code to use dev_groupsGreg Kroah-Hartman2013-10-161-26/+39
| * | pcmcia: at91_cf: fix deferred probe from __initJohan Hovold2013-09-261-6/+5
| |/
* | drivers/pcmcia/yenta_socket.c: convert to module_pci_driverLibo Chen2013-09-261-15/+1
* | drivers/pcmcia/pd6729.c: convert to module_pci_driverLibo Chen2013-09-261-12/+1
|/
* PCI: Delay enabling bridges until they're neededYinghai Lu2013-07-251-1/+0
* Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2013-07-021-1/+0
|\
| * Finally eradicate CONFIG_HOTPLUGStephen Rothwell2013-06-031-1/+0
OpenPOWER on IntegriCloud