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 CPU hotplug when using the SLB shadow buffer
  [POWERPC] efika: add phy-handle property for fec_mpc52xx

...

This commit is contained in:

Linus Torvalds 2008-01-13 10:01:45 -08:00

parent 417009f64f 473980a993

commit fd4be699b5

5 changed files with 51 additions and 0 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

39

arch/powerpc/kernel/prom_init.c

View file

8

arch/powerpc/mm/slb.c

View file

2

arch/powerpc/platforms/pseries/hotplug-cpu.c

View file

1

arch/powerpc/platforms/pseries/lpar.c

View file

1

include/asm-powerpc/mmu-hash64.h

View file