Commit 0a53f1693cb956ebd8ba0a9acca6adb2dcb99d5f
Exists in
master
and in
20 other branches
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/ppc64: Use preempt_schedule_irq instead of preempt_schedule powerpc: Minor cleanup to lib/Kconfig.debug powerpc: Minor cleanup to sound/ppc/Kconfig powerpc: Minor cleanup to init/Kconfig powerpc: Limit memory hotplug support to PPC64 Book-3S machines powerpc: Limit hugetlbfs support to PPC64 Book-3S machines powerpc: Fix compile errors found by new ppc64e_defconfig powerpc: Add a Book-3E 64-bit defconfig powerpc/booke: Fix xmon single step on PowerPC Book-E powerpc: Align vDSO base address powerpc: Fix segment mapping in vdso32 powerpc/iseries: Remove compiler version dependent hack powerpc/perf_events: Fix priority of MSR HV vs PR bits powerpc/5200: Update defconfigs drivers/serial/mpc52xx_uart.c: Use UPIO_MEM rather than SERIAL_IO_MEM powerpc/boot/dts: drop obsolete 'fsl5200-clocking' of: Remove nested function mpc5200: support for the MAN mpc5200 based board mucmc52 mpc5200: support for the MAN mpc5200 based board uc101
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 37 changed files Side-by-side Diff
- arch/powerpc/boot/dts/cm5200.dts
- arch/powerpc/boot/dts/digsy_mtc.dts
- arch/powerpc/boot/dts/lite5200.dts
- arch/powerpc/boot/dts/lite5200b.dts
- arch/powerpc/boot/dts/media5200.dts
- arch/powerpc/boot/dts/motionpro.dts
- arch/powerpc/boot/dts/mpc5121ads.dts
- arch/powerpc/boot/dts/mucmc52.dts
- arch/powerpc/boot/dts/pcm030.dts
- arch/powerpc/boot/dts/pcm032.dts
- arch/powerpc/boot/dts/tqm5200.dts
- arch/powerpc/boot/dts/uc101.dts
- arch/powerpc/configs/52xx/cm5200_defconfig
- arch/powerpc/configs/52xx/lite5200b_defconfig
- arch/powerpc/configs/52xx/motionpro_defconfig
- arch/powerpc/configs/52xx/pcm030_defconfig
- arch/powerpc/configs/52xx/tqm5200_defconfig
- arch/powerpc/configs/mpc5200_defconfig
- arch/powerpc/configs/ppc64e_defconfig
- arch/powerpc/kernel/entry_64.S
- arch/powerpc/kernel/pci_64.c
- arch/powerpc/kernel/perf_event.c
- arch/powerpc/kernel/process.c
- arch/powerpc/kernel/setup_64.c
- arch/powerpc/kernel/vdso.c
- arch/powerpc/kernel/vdso32/vdso32.lds.S
- arch/powerpc/platforms/52xx/mpc5200_simple.c
- arch/powerpc/platforms/iseries/Makefile
- arch/powerpc/platforms/iseries/dt.c
- arch/powerpc/xmon/xmon.c
- drivers/of/of_mdio.c
- drivers/serial/mpc52xx_uart.c
- fs/Kconfig
- init/Kconfig
- lib/Kconfig.debug
- mm/Kconfig
- sound/ppc/Kconfig