Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 25 Mar 2006 16:39:55 +0000 (08:39 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 25 Mar 2006 16:39:55 +0000 (08:39 -0800)
commitd71eecf3b8e893757cc3dec560c96a32ac090890
tree5ca3ce995f506c8659753d24b911f5502b36e201
parentb55813a2e50088ca30df33fa62aeed5d3adb1796
parenta54123e27779049d27d21e6c8adfee73aa2c0734
Merge /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.