From: Linus Torvalds Date: Fri, 15 Jun 2007 14:46:36 +0000 (-0700) Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e126c7b6bbb0c5b5fc3ecf2fd1ae67c803b747cc;p=linux-beck.git 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 --- e126c7b6bbb0c5b5fc3ecf2fd1ae67c803b747cc