linux-stable-rt/arch/powerpc/mm
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
..
40x_mmu.c
44x_mmu.c
Makefile
dma-noncoherent.c
fault.c
fsl_booke_mmu.c Merge branch 'next' of git://git.secretlab.ca/git/linux-2.6 2009-12-16 13:26:53 -08:00
gup.c
hash_low_32.S
hash_low_64.S
hash_native_64.c
hash_utils_64.c
highmem.c
hugetlbpage-hash64.c
hugetlbpage.c
init_32.c
init_64.c
mem.c
mmap_64.c
mmu_context_hash32.c
mmu_context_hash64.c
mmu_context_nohash.c
mmu_decl.h Merge branch 'next' of git://git.secretlab.ca/git/linux-2.6 2009-12-16 13:26:53 -08:00
numa.c
pgtable.c
pgtable_32.c
pgtable_64.c
ppc_mmu_32.c
slb.c
slb_low.S
slice.c
stab.c
subpage-prot.c
tlb_hash32.c
tlb_hash64.c
tlb_low_64e.S
tlb_nohash.c
tlb_nohash_low.S