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: (37 commits) [POWERPC] EEH: Make sure warning message is printed [POWERPC] Make altivec code in swsusp_32.S depend on CONFIG_ALTIVEC [POWERPC] windfarm: Fix windfarm thread freezer interaction [POWERPC] Fix si_addr value on low level hash failures [POWERPC] Refresh ppc64_defconfig and enable pasemi-related options [POWERPC] pasemi: Update defconfig [POWERPC] iSeries: Fix ref counting in vio setup [POWERPC] ] Fix memset size error [POWERPC] Fix link errors for allyesconfig [POWERPC] iSeries_init_IRQ non-PCI tidy [POWERPC] Change fallocate to match unistd.h on powerpc [POWERPC] EEH: Avoid crash on null device [POWERPC] EEH: Drivers that need reset trump others [POWERPC] EEH: Clean up comments [POWERPC] Fix off-by-one error in setting decrementer on Book E/4xx (v2) [POWERPC] Fix switch_slb handling of 1T ESID values [POWERPC] Fix build failure when CONFIG_VIRT_CPU_ACCOUNTING is not defined [POWERPC] Include udbg.h when using udbg_printf [POWERPC] Fix cache line vs. block size confusion [POWERPC] Fix sysctl table check failure on PowerMac ...
Showing
- Documentation/powerpc/booting-without-of.txt 273 additions, 2 deletionsDocumentation/powerpc/booting-without-of.txt
- arch/powerpc/boot/dts/walnut.dts 3 additions, 1 deletionarch/powerpc/boot/dts/walnut.dts
- arch/powerpc/boot/wrapper 21 additions, 22 deletionsarch/powerpc/boot/wrapper
- arch/powerpc/configs/pasemi_defconfig 188 additions, 120 deletionsarch/powerpc/configs/pasemi_defconfig
- arch/powerpc/configs/ppc64_defconfig 181 additions, 66 deletionsarch/powerpc/configs/ppc64_defconfig
- arch/powerpc/kernel/cputable.c 28 additions, 8 deletionsarch/powerpc/kernel/cputable.c
- arch/powerpc/kernel/entry_32.S 23 additions, 0 deletionsarch/powerpc/kernel/entry_32.S
- arch/powerpc/kernel/head_64.S 1 addition, 1 deletionarch/powerpc/kernel/head_64.S
- arch/powerpc/kernel/idle.c 1 addition, 1 deletionarch/powerpc/kernel/idle.c
- arch/powerpc/kernel/misc_32.S 25 additions, 7 deletionsarch/powerpc/kernel/misc_32.S
- arch/powerpc/kernel/prom.c 12 additions, 0 deletionsarch/powerpc/kernel/prom.c
- arch/powerpc/kernel/prom_init.c 1 addition, 1 deletionarch/powerpc/kernel/prom_init.c
- arch/powerpc/kernel/setup_64.c 7 additions, 12 deletionsarch/powerpc/kernel/setup_64.c
- arch/powerpc/kernel/swsusp_32.S 2 additions, 0 deletionsarch/powerpc/kernel/swsusp_32.S
- arch/powerpc/kernel/time.c 3 additions, 7 deletionsarch/powerpc/kernel/time.c
- arch/powerpc/kernel/vmlinux.lds.S 1 addition, 2 deletionsarch/powerpc/kernel/vmlinux.lds.S
- arch/powerpc/mm/40x_mmu.c 8 additions, 9 deletionsarch/powerpc/mm/40x_mmu.c
- arch/powerpc/mm/44x_mmu.c 1 addition, 0 deletionsarch/powerpc/mm/44x_mmu.c
- arch/powerpc/mm/fault.c 1 addition, 1 deletionarch/powerpc/mm/fault.c
- arch/powerpc/mm/hash_low_64.S 3 additions, 2 deletionsarch/powerpc/mm/hash_low_64.S
Loading
Please register or sign in to comment