From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 30 Jun 2006 22:40:35 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.18-rc1~251
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9262e9149f346a5443300f8c451b8e7631e81a42;p=~emulex%2Finfiniband.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]: Kill sun4v virtual device layer.
  [SERIAL] sunhv: Convert to of_driver layer.
  [SPARC64]: Mask out top 8-bits in physical address when building resources.
  [SERIAL] sunsu: Missing return statement in su_probe().
---

9262e9149f346a5443300f8c451b8e7631e81a42