• Linus Torvalds's avatar
    Merge branch 'next' of git://git.secretlab.ca/git/linux-2.6 · a73611b6
    Linus Torvalds authored
    * 'next' of git://git.secretlab.ca/git/linux-2.6: (23 commits)
      powerpc: fix up for mmu_mapin_ram api change
      powerpc: wii: allow ioremap within the memory hole
      powerpc: allow ioremap within reserved memory regions
      wii: use both mem1 and mem2 as ram
      wii: bootwrapper: add fixup to calc useable mem2
      powerpc: gamecube/wii: early debugging using usbgecko
      powerpc: reserve fixmap entries for early debug
      powerpc: wii: default config
      powerpc: wii: platform support
      powerpc: wii: hollywood interrupt controller support
      powerpc: broadway processor support
      powerpc: wii: bootwrapper bits
      powerpc: wii: device tree
      powerpc: gamecube: default config
      powerpc: gamecube: platform support
      powerpc: gamecube/wii: flipper interrupt controller support
      powerpc: gamecube/wii: udbg support for usbgecko
      powerpc: gamecube/wii: do not include PCI support
      powerpc: gamecube/wii: declare as non-coherent platforms
      powerpc: gamecube/wii: introduce GAMECUBE_COMMON
      ...
    
    Fix up conflicts in arch/powerpc/mm/fsl_booke_mmu.c.
    
    Hopefully even close to correctly.
    a73611b6
Kconfig 24.5 KB