tree 326fefee4ba268d27e7b686a4af4e7a35b008428
parent f3845f3f6081b97ebc4dc905e097c07e868017b5
parent d7646f7632549124fe70fec8af834c7c1246f365
author Linus Torvalds <torvalds@linux-foundation.org> 1269641480 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1269641480 -0700

Merge branch 'urgent' of git://git.kernel.org/pub/scm/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