| commit | 5694ca9f46202c50df525472abb6d8c1dee4f8eb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Jul 14 21:57:23 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Jul 14 21:57:23 2006 -0700 |
| tree | c16a4ff264b024ea2017a88a29d8f03695bd2656 | |
| parent | 76aba64a6608fcaa02c715e93c572192f3621195 [diff] | |
| parent | ee7022dcfbf660727d6b8553cb0dbc0d4eae8f44 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64] Fix PSYCHO PCI controler init. [SPARC64] psycho: Fix pbm->name handling in pbm_register_toplevel_resources() [SERIAL] sunsab: Fix significant typo in sab_probe() [SERIAL] sunsu: Report keyboard and mouse ports in kernel log. [SPARC64]: Make sure IRQs are disabled properly during early boot.