From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Mar 2010 22:11:20 +0000 (-0700)
Subject: Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6f063aea557f66eea8c35034a25df85cae5ced33;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

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

* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: use dev_pm_ops for class pcmcia_socket_class
  power: support _noirq actions on device types and classes
  pcmcia: allow for four multifunction subdevices (again)
  pcmcia: do not use ioports < 0x100 on x86
  pd6729: Coding Style fixes
---

6f063aea557f66eea8c35034a25df85cae5ced33