summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-18 11:04:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-18 11:04:59 -0700
commit1097d7cef683c30f9768007daae2e961a0686a10 (patch)
tree1dc8f3fc26c6c4b9f5366e94cf4c20490f7f3203 /MAINTAINERS
parent57b552ba0b2faf7cce66d476ef8ce7f6210c62fd (diff)
parent4e06e240dcbb803433ee31bfe89a3e785a77cd3b (diff)
downloadlinux-1097d7cef683c30f9768007daae2e961a0686a10.tar.bz2
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.
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions