projects / profile / ivi / kernel-x86-ivi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f3845f3 d7646f7)
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Mar 2010 22:11:20 +0000 (15:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Mar 2010 22:11:20 +0000 (15:11 -0700)
commit6f063aea557f66eea8c35034a25df85cae5ced33
tree326fefee4ba268d27e7b686a4af4e7a35b008428tree | snapshot
parentf3845f3f6081b97ebc4dc905e097c07e868017b5commit | diff
parentd7646f7632549124fe70fec8af834c7c1246f365commit | diff
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
Domain: System / Uncategorized;