From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 17 May 2007 04:19:45 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: firefly_0821_release~29101
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e0f88db3028798b5e6d62d1c65c991240bf317f3;p=firefly-linux-kernel-4.4.55.git

Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Add hypervisor API negotiation and fix console bugs.
---

e0f88db3028798b5e6d62d1c65c991240bf317f3