Linus Torvalds a73611b6aa Merge branch 'next' of git://git.secretlab.ca/git/linux-2.6
* '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.
2009-12-16 13:26:53 -08:00
..
2009-12-16 07:20:12 -08:00
2009-09-08 17:53:04 -07:00
2008-08-18 21:40:03 +02:00
2008-08-04 13:18:17 +10:00
2009-03-24 11:02:58 +02:00
2009-11-05 16:51:05 +11:00
2009-11-05 16:49:53 +11:00
2009-12-09 17:09:33 +11:00
2008-11-19 16:04:58 +11:00
2009-10-30 17:21:28 +11:00
2009-11-05 16:50:26 +11:00
2009-04-07 15:18:58 +10:00
2009-12-09 17:10:37 +11:00
2008-10-15 11:31:54 +11:00
2008-09-06 19:30:15 +01:00
2009-04-01 08:59:16 -07:00
2009-08-28 14:24:10 +10:00
2008-11-19 16:04:55 +11:00
2009-07-10 14:24:05 -07:00