Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 15 Jun 2007 14:46:36 +0000 (07:46 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 15 Jun 2007 14:46:36 +0000 (07:46 -0700)
commite126c7b6bbb0c5b5fc3ecf2fd1ae67c803b747cc
tree627ae2a512194ed3cb9f0720f14706dd9d76ec16
parent22b1a9203ea634ac0ee5240e021613da3328275f
parent220ddc0847ebd42d18ee78c7e1c2f4c2e3be637d
Merge branch 'merge' of git://git./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