• Linus Torvalds's avatar
    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · b9fa38f7
    Linus Torvalds authored
    * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (49 commits)
      [POWERPC] Add zImage.iseries to arch/powerpc/boot/.gitignore
      [POWERPC] bootwrapper: fix build error on virtex405-head.S
      [POWERPC] 4xx: Fix 460GT support to not enable FPU
      [POWERPC] 4xx: Add NOR FLASH entries to Canyonlands and Glacier dts
      [POWERPC] Xilinx: of_serial support for Xilinx uart 16550.
      [POWERPC] Xilinx: boot support for Xilinx uart 16550.
      [POWERPC] celleb: Add support for PCI Express
      [POWERPC] celleb: Move miscellaneous files for Beat
      [POWERPC] celleb: Move a file for SPU on Beat
      [POWERPC] celleb: Move files for Beat mmu and iommu
      [POWERPC] celleb: Move files for Beat hvcall interfaces
      [POWERPC] celleb: Move the SCC related code for celleb
      [POWERPC] celleb: Move the files for celleb base support
      [POWERPC] celleb: Consolidate io-workarounds code
      [POWERPC] cell: Generalize io-workarounds code
      [POWERPC] Add CONFIG_PPC_PSERIES_DEBUG to enable debugging for platforms/pseries
      [POWERPC] Convert from DBG() to pr_debug() in platforms/pseries/
      [POWERPC] Register udbg console early on pseries LPAR
      [POWERPC] Mark udbg console as CON_ANYTIME, ie. callable early in boot
      [POWERPC] Set udbg_console index to 0