| commit | bd12e5c3a1927b4b14a30142a563dbe592dfdc16 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 16 12:56:12 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 16 12:56:12 2010 -0700 |
| tree | f46edf199d783c09e375e82ff1e4bc822ad865cf | |
| parent | de109c9868cf78a172ae580a83bf9a3a74a9b4bd [diff] | |
| parent | b76dc0546709aef18f123847680108c2fd33f203 [diff] |
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