]> bbs.cooldavid.org Git - net-next-2.6.git/commit
git://bbs.cooldavid.org / net-next-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: de109c9 b76dc05)
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Sep 2010 19:56:12 +0000 (12:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Sep 2010 19:56:12 +0000 (12:56 -0700)
commitbd12e5c3a1927b4b14a30142a563dbe592dfdc16
treef46edf199d783c09e375e82ff1e4bc822ad865cftree | snapshot (tar.bz2 tar.gz zip)
parentde109c9868cf78a172ae580a83bf9a3a74a9b4bdcommit | diff
parentb76dc0546709aef18f123847680108c2fd33f203commit | 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
Clone of davem's net-next-2.6 tree