tree 7925980f6295e6f3aba704f08837b03bf3578838
parent 938473b24636d77dc5e9c3f41090d071b6cf4389
parent 46b304934de417a2238d659ef6459a74cb3f5e6b
author Linus Torvalds <torvalds@g5.osdl.org> 1149962631 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1149962631 -0700

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Avoid JBUS errors on some Niagara systems.
  [FUSION]: Fix mptspi.c build with CONFIG_PM not set.
  [TG3]: Handle Sun onboard tg3 chips more correctly.
  [SPARC64]: Dump local cpu registers in sun4v_log_error()