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

Browse source

* '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.

...

This commit is contained in:

Linus Torvalds 2010-03-18 11:04:59 -07:00

parent 57b552ba0b 4e06e240dc

commit 1097d7cef6

8 changed files with 86 additions and 42 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/pcmcia/i82092.c

View file

1

drivers/pcmcia/i82365.h

View file

36

drivers/pcmcia/pcmcia_resource.c

View file

1

drivers/pcmcia/pd6729.c

View file

37

drivers/pcmcia/ti113x.h

View file

5

drivers/pcmcia/vrc4171_card.c

View file

46

drivers/pcmcia/yenta_socket.c

View file

1

drivers/scsi/pcmcia/nsp_cs.c

View file