diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-20 09:21:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-20 09:21:19 -0700 |
| commit | 27ee8963708185b96bc84a149eb5336a249a7497 (patch) | |
| tree | a69f91f42522182b524fcb57f269da2cfcb3f52d /include | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | pcmcia: fix error handling in cm4000_cs.c (diff) | |
| download | linux-dev-27ee8963708185b96bc84a149eb5336a249a7497.tar.xz linux-dev-27ee8963708185b96bc84a149eb5336a249a7497.zip | |
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: fix error handling in cm4000_cs.c
drivers/pcmcia: Add missing local_irq_restore
serial_cs: MD55x support (PCMCIA GPRS/EDGE modem) (kernel 2.6.33)
pcmcia: avoid late calls to pccard_validate_cis
pcmcia: fix ioport size calculation in rsrc_nonstatic
pcmcia: re-start on MFC override
pcmcia: fix io_probe due to parent (PCI) resources
pcmcia: use previously assigned IRQ for all card functions
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions