tree cd828f7b47731f90f4f9300130bc0977125d2a3c
parent 7713a7d195c2e11d7ba6a973317da0af862d1264
parent f798634d806615bee27d1b83479034087a02aa0f
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1184632397 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1184632397 -0700

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SERIAL] SUNHV: Fix jerky console on LDOM guests.
  [SPARC64]: Fix race between MD update and dr-cpu add.
  [SPARC64]: SMP build fix.