From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 15 Jul 2006 04:57:23 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.18-rc2~7
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5694ca9f46202c50df525472abb6d8c1dee4f8eb;p=~shefty%2Frdma-dev.git

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.
---

5694ca9f46202c50df525472abb6d8c1dee4f8eb