aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-16 12:56:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-16 12:56:12 -0700
commitbd12e5c3a1927b4b14a30142a563dbe592dfdc16 (patch)
treef46edf199d783c09e375e82ff1e4bc822ad865cf /arch
parentde109c9868cf78a172ae580a83bf9a3a74a9b4bd (diff)
parentb76dc0546709aef18f123847680108c2fd33f203 (diff)
downloadmrst-s0i3-test-bd12e5c3a1927b4b14a30142a563dbe592dfdc16.tar.gz
mrst-s0i3-test-bd12e5c3a1927b4b14a30142a563dbe592dfdc16.tar.xz
mrst-s0i3-test-bd12e5c3a1927b4b14a30142a563dbe592dfdc16.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 pcnet_cs: try setting io_lines to 16 if card setup fails pcmcia: per-device, not per-socket debug messages pcmcia serial_cs.c: fix multifunction card handling
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions