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] iSeries: Remove unused mail address [POWERPC] mpic: Fix use of uninitialized variable [POWERPC] Add kernstart_addr to list of allowed symbols in prom_init [POWERPC] Fix __set_fixmap() for STRICT_MM_TYPECHECKS [POWERPC] PS3: Fix memory hotplug
Showing
- arch/powerpc/kernel/prom_init_check.sh 1 addition, 1 deletionarch/powerpc/kernel/prom_init_check.sh
- arch/powerpc/mm/pgtable_32.c 1 addition, 1 deletionarch/powerpc/mm/pgtable_32.c
- arch/powerpc/platforms/ps3/mm.c 3 additions, 0 deletionsarch/powerpc/platforms/ps3/mm.c
- arch/powerpc/sysdev/mpic.c 3 additions, 17 deletionsarch/powerpc/sysdev/mpic.c
- drivers/block/viodasd.c 1 addition, 1 deletiondrivers/block/viodasd.c
- drivers/cdrom/viocd.c 1 addition, 1 deletiondrivers/cdrom/viocd.c
- drivers/char/viocons.c 1 addition, 1 deletiondrivers/char/viocons.c
- drivers/char/viotape.c 1 addition, 1 deletiondrivers/char/viotape.c
- include/asm-powerpc/mpic.h 1 addition, 2 deletionsinclude/asm-powerpc/mpic.h
Loading
Please register or sign in to comment