Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 17 May 2007 04:19:45 +0000 (21:19 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 17 May 2007 04:19:45 +0000 (21:19 -0700)
commite0f88db3028798b5e6d62d1c65c991240bf317f3
treeca6153883c115108967428ad70b023a6190e889e
parent43c0f3d25c602dc96b201ed81ffda0bc600ff969
parentc7754d465b1feade85b5f1c4492781a30f6652a2
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.