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

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

Pull pcmcia updates from Dominik Brodowski:
 "Just a few odd fixes and improvements to the PCMCIA core"

* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: remove unused dprintk definition
  pcmcia: include <pcmcia/ds.h> for pcmcia_parse_tuple
  pcmcia: include cs_internal.h for missing declarations
  pcmcia: Use dev_get_drvdata where possible
  pcmcia: clean an indentation issues, remove extraneous spaces