tree 1dc8f3fc26c6c4b9f5366e94cf4c20490f7f3203
parent 57b552ba0b2faf7cce66d476ef8ce7f6210c62fd
parent 4e06e240dcbb803433ee31bfe89a3e785a77cd3b
author Linus Torvalds <torvalds@linux-foundation.org> 1268935499 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1268935499 -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: resource, fix lock imbalance
  pcmcia: add important if statement
  pcmcia: re-route Cardbus IRQ to ISA on ti1130 bridges if necessary
  pcmcia: allow for cb_irq to differ from pci_dev's irq in yenta_socket
  pcmcia: honor saved flags in yenta_socket's I365_CSCINT register
  pcmcia: revert "irq probe can be done without risking an IRQ storm"
  pcmcia: pd6729, i82092: use parent (PCI) resources
  pcmcia/vrc4171: use local spinlock for device local lock.