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
..
2008-07-25 10:53:26 -07:00
2005-10-18 08:26:15 -07:00
2007-05-11 05:38:25 -04:00
2008-07-24 10:47:33 -07:00
2008-06-06 11:29:10 -07:00
2007-07-16 09:05:50 -07:00
2009-11-03 16:06:53 +01:00
2007-07-17 10:23:04 -07:00
2006-06-25 10:01:20 -07:00
2009-12-15 08:53:35 -08:00
2005-04-16 15:20:36 -07:00
2006-06-25 10:01:20 -07:00
2007-05-10 18:24:13 +02:00
2005-04-16 15:20:36 -07:00
2009-01-01 10:12:19 +10:30
2008-04-29 08:11:16 -07:00
2009-06-18 13:04:05 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2009-06-16 19:47:51 -07:00
2007-10-19 11:53:41 -07:00
2006-06-20 20:24:58 -07:00
2008-07-26 12:00:07 -07:00
2006-10-06 08:53:40 -07:00
2009-10-01 21:17:49 +02:00
2009-12-14 23:55:33 +01:00
2008-01-24 20:40:05 -08:00
2009-10-01 21:17:49 +02:00
2009-10-01 21:17:49 +02:00
2009-12-15 08:53:33 -08:00
2005-04-16 15:20:36 -07:00
2008-07-30 16:29:19 -07:00
2008-01-30 13:33:00 +01:00
2008-07-26 12:00:10 -07:00
2008-07-26 12:00:10 -07:00
2008-07-22 19:24:31 +10:00