From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 Oct 2018 09:22:33 +0000 (+0100)
Subject: Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo... 
X-Git-Tag: v5.4-rc1~2430
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72f86d080560d77069dd67b067a69578731320e4;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'pcmcia-next' of git://git./linux/kernel/git/brodo/linux

Pull pcmcia fixes from Dominik Brodowski:
 "These are just a few odd fixes and improvements to the PCMCIA core and
  to a few PCMCIA device drivers"

* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges
  pcmcia: pcmcia_resource: Replace mdelay() with msleep()
  pcmcia: add error handling for pcmcia_enable_device in qlogic_stub
  char: pcmcia: cm4000_cs: Replace mdelay with usleep_range in set_protocol
  pcmcia: Use module_pcmcia_driver for scsi drivers
  pcmcia: remove KERN_INFO level from debug message
---

72f86d080560d77069dd67b067a69578731320e4