tree 2fc9ed48d50e0552f5f48d23c725930bb950973f
parent fe26adf431a58d620819618e52a10bf9b5cfde52
parent d3fdd701248290b511683ff8d348073295f07833
author Linus Torvalds <torvalds@linux-foundation.org> 1518119329 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1518119329 -0800

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

Pull pcmcia updates from Dominik Brodowski:
 "The linux-pcmcia mailing list was shut down, so offer an alternative
  path for patches in MAINTAINERS.

  Also, throw in two odd fixes for the pcmcia subsystem"

* 'pcmcia' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia:
  pcmcia: soc_common: Handle return value of clk_prepare_enable
  pcmcia: use proper printk format for resource
  pcmcia: remove mailing list, update MAINTAINERS