projects / profile / common / kernel-common.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 63c70a0 b83156b)
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Jun 2010 16:55:21 +0000 (09:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Jun 2010 16:55:21 +0000 (09:55 -0700)
commitf1f6ea352257e0df33cf0184ba777c293cb6f1d6
treebff9547a1f45db619848c5de62033cb48e61c73btree | snapshot
parent63c70a0d7b59bac08bd14cd24c36f76aafc25de6commit | diff
parentb83156b52dd77979cc93bafc2283929532f6f7d0commit | 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: avoid validate_cis failure on CIS override
  pcmcia: dev_node removal bugfix
  pcmcia: yenta_socket.c Remove extra #ifdef CONFIG_YENTA_TI
  pcmcia: only keep saved I365_CSCINT flag if there is no PCI irq
Domain: SCM / Uncategorized;