From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 19 Dec 2020 20:50:10 +0000 (-0800)
Subject: Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo... 
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=651283d57eb4107f4a81af282064e597e2f9b181;p=kernel.git

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

Pull pcmcia updates from Dominik Brodowski:
 "Besides a few PCMCIA odd fixes, the NEC VRC4173 CARDU driver is
  removed, as it has not compiled in ages"

* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: omap: Fix error return code in omap_cf_probe()
  pcmcia: Remove NEC VRC4173 CARDU
  pcmcia: db1xxx_ss: remove unneeded semicolon
  pcmcia/electra_cf: Fix some return values in 'electra_cf_probe()' in case of error
---

651283d57eb4107f4a81af282064e597e2f9b181