tree 5ca3ce995f506c8659753d24b911f5502b36e201
parent b55813a2e50088ca30df33fa62aeed5d3adb1796
parent a54123e27779049d27d21e6c8adfee73aa2c0734
author Linus Torvalds <torvalds@g5.osdl.org> 1143304795 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1143304795 -0800

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:
  [SPARC]: Try to start getting SMP back into shape.