Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 17 Jan 2008 23:49:49 +0000 (15:49 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 17 Jan 2008 23:49:49 +0000 (15:49 -0800)
commitabde3dff2496d9d44a218cf8e2a17c2383f20b22
tree8755eabb1d89ab2d8cc439e9d45892f1bb0b231a
parenta3c53e2310192e63e49610ffcb6a36b2a706fa3e
parent6320bcebc0ee0bafc61f293bec2d0809171f6b1d
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix hypervisor TLB operation error reporting.