]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 938473b 46b3049)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 10 Jun 2006 18:03:51 +0000 (11:03 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 10 Jun 2006 18:03:51 +0000 (11:03 -0700)
commit1f4d4a7e8f5a46929a987ec17987dbbdd73029d4
tree7925980f6295e6f3aba704f08837b03bf3578838tree | snapshot
parent938473b24636d77dc5e9c3f41090d071b6cf4389commit | diff
parent46b304934de417a2238d659ef6459a74cb3f5e6bcommit | diff
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()
Linux 2.6 source tree