Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (454 commits) [POWERPC] Cell IOMMU fixed mapping support [POWERPC] Split out the ioid fetching/checking logic [POWERPC] Add support to cell_iommu_setup_page_tables() for multiple windows [POWERPC] Split out the IOMMU logic from cell_dma_dev_setup() [POWERPC] Split cell_iommu_setup_hardware() into two parts [POWERPC] Split out the logic that allocates struct iommus [POWERPC] Allocate the hash table under 1G on cell [POWERPC] Add set_dma_ops() to match get_dma_ops() [POWERPC] 83xx: Clean up / convert mpc83xx board DTS files to v1 format. [POWERPC] 85xx: Only invalidate TLB0 and TLB1 [POWERPC] 83xx: Fix typo in mpc837x compatible entries [POWERPC] 85xx: convert sbc85* boards to use machine_device_initcall [POWERPC] 83xx: rework platform Kconfig [POWERPC] 85xx: rework platform Kconfig [POWERPC] 86xx: Remove unused IRQ defines [POWERPC] QE: Explicitly set address-cells and size cells for muram [POWERPC] Convert StorCenter DTS file to /dts-v1/ format. [POWERPC] 86xx: Convert all 86xx DTS files to /dts-v1/ format. [PPC] Remove 85xx from arch/ppc [PPC] Remove 83xx from arch/ppc ...
No related branches found
No related tags found
Showing
- Documentation/kernel-parameters.txt 1 addition, 0 deletionsDocumentation/kernel-parameters.txt
- Documentation/powerpc/00-INDEX 3 additions, 0 deletionsDocumentation/powerpc/00-INDEX
- Documentation/powerpc/booting-without-of.txt 314 additions, 53 deletionsDocumentation/powerpc/booting-without-of.txt
- Documentation/powerpc/qe_firmware.txt 295 additions, 0 deletionsDocumentation/powerpc/qe_firmware.txt
- arch/powerpc/Kconfig 15 additions, 2 deletionsarch/powerpc/Kconfig
- arch/powerpc/Kconfig.debug 25 additions, 1 deletionarch/powerpc/Kconfig.debug
- arch/powerpc/Makefile 3 additions, 0 deletionsarch/powerpc/Makefile
- arch/powerpc/boot/.gitignore 2 additions, 0 deletionsarch/powerpc/boot/.gitignore
- arch/powerpc/boot/4xx.c 393 additions, 83 deletionsarch/powerpc/boot/4xx.c
- arch/powerpc/boot/4xx.h 12 additions, 2 deletionsarch/powerpc/boot/4xx.h
- arch/powerpc/boot/Makefile 112 additions, 6 deletionsarch/powerpc/boot/Makefile
- arch/powerpc/boot/bamboo.c 3 additions, 3 deletionsarch/powerpc/boot/bamboo.c
- arch/powerpc/boot/cuboot-52xx.c 1 addition, 1 deletionarch/powerpc/boot/cuboot-52xx.c
- arch/powerpc/boot/cuboot-824x.c 53 additions, 0 deletionsarch/powerpc/boot/cuboot-824x.c
- arch/powerpc/boot/cuboot-83xx.c 3 additions, 2 deletionsarch/powerpc/boot/cuboot-83xx.c
- arch/powerpc/boot/cuboot-85xx-cpm2.c 66 additions, 0 deletionsarch/powerpc/boot/cuboot-85xx-cpm2.c
- arch/powerpc/boot/cuboot-85xx.c 4 additions, 3 deletionsarch/powerpc/boot/cuboot-85xx.c
- arch/powerpc/boot/cuboot-8xx.c 1 addition, 1 deletionarch/powerpc/boot/cuboot-8xx.c
- arch/powerpc/boot/cuboot-hpc2.c 1 addition, 1 deletionarch/powerpc/boot/cuboot-hpc2.c
- arch/powerpc/boot/cuboot-katmai.c 56 additions, 0 deletionsarch/powerpc/boot/cuboot-katmai.c
Loading
Please register or sign in to comment