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

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2007-06-15 07:46:36 -07:00

parent 22b1a9203e 220ddc0847

commit e126c7b6bb

3 changed files with 19 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

arch/powerpc/kernel/udbg.c

View file

13

arch/powerpc/platforms/powermac/setup.c

View file

1

arch/powerpc/platforms/powermac/smp.c

View file