tree 70cc80a7270ac6ee9e338e4c87a1f06c2432e79b
parent 1b0f06d0b4860a8a73dc0b48540d82d8897ead71
parent a83f982313bc60dd3d87e50f8c88d6a169e8a5a0
author Linus Torvalds <torvalds@g5.osdl.org> 1152802391 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1152802391 -0700

Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 of HEAD

* HEAD:
  [SPARC]: Fix OF register translations under sub-PCI busses.
  [SPARC64]: Refine Sabre wsync logic.
  [SERIAL] sunsu: Handle keyboard and mouse ports directly.
  [SPARC64]: Fix 2 bugs in sabre_irq_build()
  [SPARC64]: Update defconfig.
  [SPARC64]: Fix make headers_install
  [SPARC64]: of_device_register() error checking fix