kernel_optimize_test/Documentation/powerpc
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
..
dts-bindings Merge branch 'next' of git://git.secretlab.ca/git/linux-2.6 2009-12-16 13:26:53 -08:00
00-INDEX powerpc: Remove outdated Documentation/powerpc/smp.txt 2008-10-07 14:26:19 +11:00
booting-without-of.txt powerpc: Refactor device tree binding 2009-06-23 08:09:58 -05:00
bootwrapper.txt powerpc/bootwrapper: Add documentation of boot wrapper targets 2008-07-04 00:59:03 -06:00
cpu_features.txt documentation: update header file paths 2009-01-06 15:59:28 -08:00
eeh-pci-error-recovery.txt powerpc: Move include files to arch/powerpc/include/asm 2008-08-04 12:02:00 +10:00
hvcs.txt
kvm_440.txt KVM: ppc: PowerPC 440 KVM implementation 2008-04-27 18:21:39 +03:00
mpc52xx.txt
phyp-assisted-dump.txt [POWERPC] pseries: phyp dump: Documentation 2008-03-26 08:44:06 +11:00
qe_firmware.txt trivial: Miscellaneous documentation typo fixes 2009-06-12 18:01:47 +02:00
sound.txt
zImage_layout.txt