Merge tag 'pcmcia-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo...

Pull PCMCIA updates from Dominik Brodowski:
 "A number of minor PCMCIA bugfixes and cleanups, and a patch removing
  obsolete host controller drivers"

* tag 'pcmcia-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: remove obsolete host controller drivers
  pcmcia: Convert to use less arguments in pci_bus_for_each_resource()
  PCMCIA: Fix garbled log messages for KERN_CONT

diff --cc arch/mips/configs/mtx1_defconfig
Simple merge

diff --cc arch/powerpc/configs/ppc6xx_defconfig
Simple merge

diff --cc drivers/pci/quirks.c
Simple merge

diff --cc drivers/pcmcia/rsrc_nonstatic.c
Simple merge