summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for-4.21' of git://git.armlinux.org.uk/~rmk/linux-armLinus Torvalds2019-01-059-260/+290
|\
| * pcmcia: sa1100*: remove redundant bvd1/bvd2 settingRussell King2018-12-041-2/+2
| * ARM: pxa/lubbock: switch PCMCIA to MAX1600 libraryRussell King2018-12-042-90/+21Star
| * ARM: pxa/mainstone: switch PCMCIA to MAX1600 library and gpiod APIsRussell King2018-12-042-79/+35Star
| * ARM: sa1100/neponset: switch PCMCIA to MAX1600 library and gpiod APIsRussell King2018-12-042-61/+19Star
| * ARM: sa1100/jornada720: switch PCMCIA to gpiod APIsRussell King2018-12-041-28/+55
| * pcmcia: add MAX1600 libraryRussell King2018-12-044-0/+158
* | pcmcia: allow PCMCIA support independent of the architectureChristoph Hellwig2018-11-231-0/+1
|/
* Merge tag 'powerpc-4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/p...Linus Torvalds2018-10-261-1/+1
|\
| * powerpc: handover page flags with a pgprot_t parameterChristophe Leroy2018-10-141-1/+1
| * powerpc/mm: properly set PAGE_KERNEL flags in ioremap()Christophe Leroy2018-10-141-1/+1
* | Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/b...Linus Torvalds2018-10-233-3/+39
|\ \
| * | pcmcia: Implement CLKRUN protocol disabling for Ricoh bridgesMaciej S. Szmigiero2018-10-012-1/+37
| * | pcmcia: pcmcia_resource: Replace mdelay() with msleep()Jia-Ju Bai2018-10-011-2/+2
| |/
* | gpiolib: Pass array info to get/set array functionsJanusz Krzysztofik2018-09-131-1/+1
* | gpiolib: Pass bitmaps, not integer arrays, to get/set arrayJanusz Krzysztofik2018-09-131-3/+4
|/
* pcmcia: remove long deprecated pcmcia_request_exclusive_irq() functionLinus Torvalds2018-08-181-36/+0Star
* treewide: kzalloc() -> kcalloc()Kees Cook2018-06-131-1/+1
* treewide: kmalloc() -> kmalloc_array()Kees Cook2018-06-131-2/+2
* Merge branch 'for-linus-sa1100' of git://git.armlinux.org.uk/~rmk/linux-armLinus Torvalds2018-04-099-466/+108Star
|\
| * ARM: sa1100/simpad: switch simpad CF to use gpiod APIsRussell King2018-04-061-9/+3Star
| * ARM: sa1100/shannon: convert to generic CF socketsRussell King2018-04-064-109/+0Star
| * ARM: sa1100/nanoengine: convert to generic CF socketsRussell King2018-04-064-138/+0Star
| * ARM: sa1100/h3xxx: switch h3xxx PCMCIA to use gpiod APIsRussell King2018-03-241-9/+7Star
| * ARM: sa1100/cerf: convert to generic CF socketsRussell King2018-03-244-91/+0Star
| * ARM: sa1100/assabet: convert to generic CF socketsRussell King2018-03-244-105/+0Star
| * pcmcia: sa1100: provide generic CF supportRussell King2018-03-241-5/+98
* | Merge tag 'pm-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafa...Linus Torvalds2018-04-032-3/+8
|\ \
| * | PCMCIA / PM: Avoid noirq suspend aborts during suspend-to-idleRafael J. Wysocki2018-02-222-3/+8
| |/
* | pcmcia: remove blackfin driverArnd Bergmann2018-03-263-324/+0Star
* | pcmcia: remove m32r driversArnd Bergmann2018-03-266-1724/+0Star
|/
* Merge branch 'pcmcia' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/...Linus Torvalds2018-02-082-3/+7
|\
| * pcmcia: soc_common: Handle return value of clk_prepare_enableArvind Yadav2018-01-241-2/+6
| * pcmcia: use proper printk format for resourceDominik Brodowski2018-01-241-1/+1
* | pcmcia: at91_cf: Use PTR_ERR_OR_ZERO()Vasyl Gomonovych2017-11-291-3/+1Star
|/
* drivers/pcmcia/sa1111_badge4.c: avoid unused function warningArnd Bergmann2017-11-181-0/+2
* Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-armLinus Torvalds2017-11-161-13/+20
|\
| * pcmcia: sa1111: remove special sa1111 mmio accessorsRussell King2017-10-031-6/+6
| * pcmcia: sa1111: use sa1111_get_irq() to obtain IRQ resourcesRussell King2017-10-031-7/+14
* | Merge tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/ker...Linus Torvalds2017-11-164-12/+6Star
|\ \
| * | drivers/pcmcia: omap1: Fix error in automated timer conversionKees Cook2017-11-051-1/+3
| * | drivers/pcmcia: Convert timers to use timer_setup()Kees Cook2017-11-048-31/+24Star
| * | pcmcia: m32r: Convert timers to use timer_setup()Kees Cook2017-10-202-10/+4Star
| * | pcmcia: make pccard_cis_attr constBhumika Goyal2017-10-042-2/+2
| |/
* | Merge tag 'pci-v4.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2017-11-161-3/+2Star
|\ \
| * | PCI: Add for_each_pci_bridge() helperAndy Shevchenko2017-11-071-3/+2Star
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2017-11-151-5/+7
|\ \
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-11-0417-0/+17
| |\ \
| * | | pcmcia/electra_cf: Convert timers to use timer_setup()Kees Cook2017-10-181-5/+7
| | |/ | |/|
* | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2017-11-148-31/+26Star
|\ \ \ | |_|/ |/| |