tree 8d64537c600024a4220d1309873ac3467726c3b0
parent 97c440ba41d4e7cddb8e14c7c7ec49dad2560709
parent 18b8e08e290e9df588f51f5a7df50555f5a25664
author Linus Torvalds <torvalds@linux-foundation.org> 1231377833 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1231377833 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Work around branch tracer warning.
  sparc64: Fix unsigned long long warnings in drivers.
  sparc64: Use unsigned long long for u64.
  sparc: refactor code in fault_32.c
  sparc64: refactor code in init_64.c
  sparc64: refactor code in viohs.c
  sparc: make proces_ver_nack a bit more readable