aboutsummaryrefslogtreecommitdiff
path: root/arch/mips
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-11-13 08:20:38 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-11-13 08:20:38 -0800
commit239fd45938f9ddf64f120e0260c7b76eb73bd5a7 (patch)
tree2b0350fb9f45f2ffa7473e6c3d75f9ff26d85e82 /arch/mips
parenteea2078eaf2bcd4e5e8b2e08798071efedac5e17 (diff)
parent36b600f2649e3be49039efe31edeeb64277dbd99 (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] cell: set ARCH_SPARSEMEM_DEFAULT in Kconfig [POWERPC] Fix cell "new style" mapping and add debug [POWERPC] pseries: Force 4k update_flash block and list sizes [POWERPC] CPM_UART: Fix non-console initialisation [POWERPC] CPM_UART: Fix non-console transmit [POWERPC] Make sure initrd and dtb sections get into zImage correctly
Diffstat (limited to 'arch/mips')
0 files changed, 0 insertions, 0 deletions