Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (24 commits) [POWERPC] Fix compile error with kexec and CONFIG_SMP=n [POWERPC] Split initrd logic out of early_init_dt_scan_chosen() to fix warning [POWERPC] Fix warning in hpte_decode(), and generalize it [POWERPC] Minor pSeries IOMMU debug cleanup [POWERPC] PS3: Fix sys manager build error [POWERPC] Assorted janitorial EEH cleanups [POWERPC] We don't define CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID [POWERPC] pmu_sys_suspended is only defined for PPC32 [POWERPC] Fix incorrect calculation of I/O window addresses [POWERPC] celleb: Update celleb_defconfig [POWERPC] celleb: Fix parsing of machine type hack command line option [POWERPC] celleb: Fix PCI config space accesses to subordinate buses [POWERPC] celleb: Fix support for multiple PCI domains [POWERPC] Wire up sys_utimensat [POWERPC] CPM_UART: Removed __init from cpm_uart_init_portdesc to fix warning [POWERPC] User rheap from arch/powerpc/lib [POWERPC] 83xx: Fix the PCI ranges in the MPC834x_MDS device tree. [POWERPC] 83xx: Fix the PCI ranges in the MPC832x_MDS device tree. [POWERPC] CPM_UART: cpm_uart_set_termios should take ktermios, not termios [POWERPC] Change rheap functions to use ulongs instead of pointers ...
Showing
- arch/powerpc/boot/dts/mpc832x_mds.dts 1 addition, 1 deletionarch/powerpc/boot/dts/mpc832x_mds.dts
- arch/powerpc/boot/dts/mpc834x_mds.dts 2 additions, 2 deletionsarch/powerpc/boot/dts/mpc834x_mds.dts
- arch/powerpc/configs/celleb_defconfig 85 additions, 44 deletionsarch/powerpc/configs/celleb_defconfig
- arch/powerpc/kernel/pci_64.c 13 additions, 24 deletionsarch/powerpc/kernel/pci_64.c
- arch/powerpc/kernel/prom.c 31 additions, 16 deletionsarch/powerpc/kernel/prom.c
- arch/powerpc/lib/Makefile 0 additions, 2 deletionsarch/powerpc/lib/Makefile
- arch/powerpc/lib/rheap.c 67 additions, 50 deletionsarch/powerpc/lib/rheap.c
- arch/powerpc/mm/hash_native_64.c 17 additions, 20 deletionsarch/powerpc/mm/hash_native_64.c
- arch/powerpc/platforms/83xx/mpc8313_rdb.c 2 additions, 0 deletionsarch/powerpc/platforms/83xx/mpc8313_rdb.c
- arch/powerpc/platforms/83xx/mpc832x_rdb.c 2 additions, 0 deletionsarch/powerpc/platforms/83xx/mpc832x_rdb.c
- arch/powerpc/platforms/83xx/mpc834x_itx.c 2 additions, 0 deletionsarch/powerpc/platforms/83xx/mpc834x_itx.c
- arch/powerpc/platforms/83xx/mpc834x_mds.c 2 additions, 0 deletionsarch/powerpc/platforms/83xx/mpc834x_mds.c
- arch/powerpc/platforms/86xx/mpc86xx_hpcn.c 6 additions, 1 deletionarch/powerpc/platforms/86xx/mpc86xx_hpcn.c
- arch/powerpc/platforms/celleb/pci.c 1 addition, 0 deletionsarch/powerpc/platforms/celleb/pci.c
- arch/powerpc/platforms/celleb/scc_epci.c 4 additions, 4 deletionsarch/powerpc/platforms/celleb/scc_epci.c
- arch/powerpc/platforms/celleb/setup.c 1 addition, 1 deletionarch/powerpc/platforms/celleb/setup.c
- arch/powerpc/platforms/pseries/eeh.c 10 additions, 3 deletionsarch/powerpc/platforms/pseries/eeh.c
- arch/powerpc/platforms/pseries/eeh_driver.c 4 additions, 3 deletionsarch/powerpc/platforms/pseries/eeh_driver.c
- arch/powerpc/platforms/pseries/iommu.c 2 additions, 1 deletionarch/powerpc/platforms/pseries/iommu.c
- arch/powerpc/platforms/pseries/kexec.c 1 addition, 0 deletionsarch/powerpc/platforms/pseries/kexec.c
Loading
Please register or sign in to comment