q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/arch/powerpc/platforms
History
Linus Torvalds d4429f608a Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (71 commits)
  powerpc/44x: Update ppc44x_defconfig
  powerpc/watchdog: Make default timeout for Book-E watchdog a Kconfig option
  fsl_rio: Add comments for sRIO registers.
  powerpc/fsl-booke: Add e55xx (64-bit) smp defconfig
  powerpc/fsl-booke: Add p5020 DS board support
  powerpc/fsl-booke64: Use TLB CAMs to cover linear mapping on FSL 64-bit chips
  powerpc/fsl-booke: Add support for FSL Arch v1.0 MMU in setup_page_sizes
  powerpc/fsl-booke: Add support for FSL 64-bit e5500 core
  powerpc/85xx: add cache-sram support
  powerpc/85xx: add ngPIXIS FPGA device tree node to the P1022DS board
  powerpc: Fix compile error with paca code on ppc64e
  powerpc/fsl-booke: Add p3041 DS board support
  oprofile/fsl emb: Don't set MSR[PMM] until after clearing the interrupt.
  powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chips
  powerpc/mpc8xxx_gpio: Add support for 'qoriq-gpio' controllers
  powerpc/fsl_booke: Add support to boot from core other than 0
  powerpc/p1022: Add probing for individual DMA channels
  powerpc/fsl_soc: Search all global-utilities nodes for rstccr
  powerpc: Fix invalid page flags in create TLB CAM path for PTE_64BIT
  powerpc/mpc83xx: Support for MPC8308 P1M board
  ...

Fix up conflict with the generic irq_work changes in arch/powerpc/kernel/time.c
2010-10-21 21:19:54 -07:00
..
8xx powerpc/8xx: Add support for the MPC8xx based boards from TQC 2010-08-04 14:25:22 -05:00
40x Remove REDWOOD_[456] config options and conditional code 2010-07-26 09:06:04 -04:00
44x powerpc/44x: Add support for the AMCC APM821xx SoC 2010-10-13 08:47:09 -04:00
52xx powerpc/5200: tighten up ac97 reset timing 2010-09-08 11:55:26 -06:00
82xx powerpc: remove references to of_device and to_of_device 2010-07-24 09:58:21 -06:00
83xx powerpc/mpc83xx: Support for MPC8308 P1M board 2010-10-14 00:52:53 -05:00
85xx powerpc/fsl-booke: Add p5020 DS board support 2010-10-14 00:55:18 -05:00
86xx Merge commit 'v2.6.35-rc6' into devicetree/next 2010-07-24 09:49:13 -06:00
512x powerpc/512x: fix clk_get() return value 2010-09-01 09:31:06 -06:00
amigaone of/address: Clean up function declarations 2010-08-01 01:42:42 -06:00
cell Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2010-10-21 21:19:54 -07:00
chrp powerpc/chrp/nvram.c: Add of_node_put to avoid memory leak 2010-09-02 14:07:34 +10:00
embedded6xx powerpc, memblock: Fix memblock API change fallout 2010-09-11 10:30:28 +02:00
iseries powerpc/Makefiles: Change to new flag variables 2010-10-13 16:19:22 +11:00
maple powerpc/maple: Add of_node_put to avoid memory leak 2010-09-02 14:07:33 +10:00
pasemi powerpc: remove references to of_device and to_of_device 2010-07-24 09:58:21 -06:00
powermac powerpc/powermac/pfunc_core.c: Add of_node_put to avoid memory leak 2010-09-02 14:07:33 +10:00
prep powerpc/kconfig: Kill PPC_MULTIPLATFORM 2009-03-11 17:11:35 +11:00
ps3 Merge branch 'master' into for-next 2010-08-04 15:14:38 +02:00
pseries Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2010-10-21 21:19:54 -07:00
fsl_uli1575.c PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs 2010-02-23 09:43:31 -08:00
Kconfig powerpc: Fix config dependency problem with MPIC_U3_HT_IRQS 2010-08-24 15:28:29 +10:00
Kconfig.cputype powerpc/fsl-booke: Add support for FSL 64-bit e5500 core 2010-10-14 00:55:03 -05:00
Makefile powerpc/85xx: Kconfig cleanup 2009-11-20 16:45:27 -06:00