OpenCloudOS-Kernel/arch/powerpc/platforms
Linus Torvalds 3960ef326a Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  ARM: Consolidate the clkdev header files
  ARM: set vga memory base at run-time
  ARM: convert PCI defines to variables
  ARM: pci: make pcibios_assign_all_busses use pci_has_flag
  ARM: remove unnecessary mach/hardware.h includes
  pci: move microblaze and powerpc pci flag functions into asm-generic
  powerpc: rename ppc_pci_*_flags to pci_*_flags

Fix up conflicts in arch/microblaze/include/asm/pci-bridge.h
2011-07-26 17:12:10 -07:00
..
8xx powerpc/irq: Stop exporting irq_map 2011-05-04 15:02:15 +10:00
40x powerpc: rename ppc_pci_*_flags to pci_*_flags 2011-07-12 09:28:04 -05:00
44x powerpc: rename ppc_pci_*_flags to pci_*_flags 2011-07-12 09:28:04 -05:00
52xx Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:12:10 -07:00
82xx powerpc: rename ppc_pci_*_flags to pci_*_flags 2011-07-12 09:28:04 -05:00
83xx atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
85xx atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
86xx powerpc/86xx: improve calculation of DIU pixel clock on the MPC8610 HPCD 2011-06-27 08:36:17 -05:00
512x powerpc/mpc5121_ads_cpld: Remove use of NO_IRQ_IGNORE 2011-05-19 15:31:47 +10:00
amigaone pcspkr: Cleanup Kconfig dependencies 2011-06-09 15:01:41 +02:00
cell atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
chrp Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:12:10 -07:00
embedded6xx powerpc: Remove trival irq_host_ops.unmap 2011-05-19 15:31:39 +10:00
iseries atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
maple powerpc/maple: Register CPC925 EDAC device on all boards with CPC925 2011-06-29 17:48:26 +10:00
pasemi treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
powermac Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:12:10 -07:00
prep pcspkr: Cleanup Kconfig dependencies 2011-06-09 15:01:41 +02:00
ps3 powerpc: Remove trival irq_host_ops.unmap 2011-05-19 15:31:39 +10:00
pseries atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
wsp powerpc: Avoid extra indirect function call in sending IPIs 2011-06-20 11:21:32 +10:00
Kconfig powerpc: introduce the ePAPR embedded hypervisor vmpic driver 2011-06-27 08:30:26 -05:00
Kconfig.cputype powerpc/64: Make server perfmon only built on ppc64 server devices 2011-07-22 13:34:30 +10:00
Makefile powerpc: Add WSP platform 2011-05-06 13:32:35 +10:00
fsl_uli1575.c PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs 2010-02-23 09:43:31 -08:00