aboutsummaryrefslogtreecommitdiffstats
path: root/include/pcmcia/ds.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-20 09:21:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-20 09:21:19 -0700
commit27ee8963708185b96bc84a149eb5336a249a7497 (patch)
treea69f91f42522182b524fcb57f269da2cfcb3f52d /include/pcmcia/ds.h
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
parentpcmcia: fix error handling in cm4000_cs.c (diff)
downloadlinux-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/pcmcia/ds.h')
0 files changed, 0 insertions, 0 deletions