Skip to contentSkip to conversation

PCMCIA bugfixes for 2.6.34-rc2

GIT PULL Dominik Brodowski 1 participant 1 message Mar 16, 2010

lore
Share & tools
lore
#0 lore raw

Linus,

some PCMCIA bugfixes for 2.6.34-rc2 are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git urgent

Please pull from that location. The diffstat and list of changes follows, the individual diffs were sent (at least) to the linux-pcmcia list.

Thanks,
Dominik

----

Dan Carpenter (1):
pcmcia: add important if statement

Dominik Brodowski (2):
pcmcia: pd6729, i82092: use parent (PCI) resources
pcmcia: revert "irq probe can be done without risking an IRQ storm"

Jens Künzer (3):
pcmcia: honor saved flags in yenta_socket's I365_CSCINT register
pcmcia: allow for cb_irq to differ from pci_dev's irq in yenta_socket
pcmcia: re-route Cardbus IRQ to ISA on ti1130 bridges if necessary

Jiri Slaby (1):
PCMCIA: resource, fix lock imbalance

Yoichi Yuasa (1):
pcmcia/vrc4171: use local spinlock for device local lock.

 drivers/pcmcia/i82092.c          |    1 +
 drivers/pcmcia/i82365.h          |    1 +
 drivers/pcmcia/pcmcia_resource.c |   36 +++++++++++++----------------
 drivers/pcmcia/pd6729.c          |    1 +
 drivers/pcmcia/ti113x.h          |   37 ++++++++++++++++++++++++++++-
 drivers/pcmcia/vrc4171_card.c    |    5 ++-
 drivers/pcmcia/yenta_socket.c    |   46 +++++++++++++++++++++++--------------
 drivers/scsi/pcmcia/nsp_cs.c     |    1 +
 8 files changed, 86 insertions(+), 42 deletions(-)