tree 627ae2a512194ed3cb9f0720f14706dd9d76ec16
parent 22b1a9203ea634ac0ee5240e021613da3328275f
parent 220ddc0847ebd42d18ee78c7e1c2f4c2e3be637d
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1181918796 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1181918796 -0700

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix console output getting dropped on platforms without udbg_putc
  [POWERPC] Fix per-cpu allocation on oldworld SMP powermacs