| commit | d659fc14cbd39fef625072819c6968044975fda7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Nov 15 18:58:37 2008 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Nov 15 18:58:37 2008 -0800 |
| tree | b9e7f3e251a37e23708012943168f2a3f9383c82 | |
| parent | 9bf1a2445f3c569098b8de7097ca324e65abecc2 [diff] | |
| parent | b1769450da0eeae2d95aae5496acbdf4c6ba89b2 [diff] |
Merge git://git.kernel.org/pub/scm/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