git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9bf1a24 b176945)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 Nov 2008 02:58:37 +0000 (18:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 Nov 2008 02:58:37 +0000 (18:58 -0800)
commitd659fc14cbd39fef625072819c6968044975fda7
treeb9e7f3e251a37e23708012943168f2a3f9383c82tree | snapshot
parent9bf1a2445f3c569098b8de7097ca324e65abecc2commit | diff
parentb1769450da0eeae2d95aae5496acbdf4c6ba89b2commit | diff
Merge git://git./linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: ensure correct logging in do_io_probe
  pcmcia: add another pata/ide ID
  pcmcia: add braces in error path
  pcmcia: struct device - replace bus_id with dev_name(), dev_set_name()
  pcmcia: setup resource information for pseudo multifunction devices.
  pcmcia: fix indentation & braces disagreement - add braces
Pandora Kernel Repository