linux/arch/powerpc/platforms
Linus Torvalds 0bd2cbcdfa Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (29 commits)
  of/flattree: forward declare struct device_node in of_fdt.h
  ipmi: explicitly include of_address.h and of_irq.h
  sparc: explicitly cast negative phandle checks to s32
  powerpc/405: Fix missing #{address,size}-cells in i2c node
  powerpc/5200: dts: refactor dts files
  powerpc/5200: dts: Change combatible strings on localbus
  powerpc/5200: dts: remove unused properties
  powerpc/5200: dts: rename nodes to prepare for refactoring dts files
  of/flattree: Update dtc to current mainline.
  of/device: Don't register disabled devices
  powerpc/dts: fix syntax bugs in bluestone.dts
  of: Fixes for OF probing on little endian systems
  of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF
  of/flattree: Add of_flat_dt_match() helper function
  of_serial: explicitly include of_irq.h
  of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree
  of/flattree: Reorder unflatten_dt_node
  of/flattree: Refactor unflatten_dt_node
  of/flattree: Add non-boottime device tree functions
  of/flattree: Add Kconfig for EARLY_FLATTREE
  ...

Fix up trivial conflict in arch/sparc/prom/tree_32.c as per Grant.
2011-01-10 08:57:03 -08:00
..
8xx powerpc/8xx: Add support for the MPC8xx based boards from TQC 2010-08-04 14:25:22 -05:00
40x of/flattree: Add of_flat_dt_match() helper function 2011-01-01 13:03:25 -07:00
44x powerpc/44x: Add support for the AMCC APM821xx SoC 2010-10-13 08:47:09 -04:00
52xx Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2011-01-10 08:57:03 -08:00
82xx powerpc: remove references to of_device and to_of_device 2010-07-24 09:58:21 -06:00
83xx of/flattree: Add of_flat_dt_match() helper function 2011-01-01 13:03:25 -07:00
85xx of/flattree: Add of_flat_dt_match() helper function 2011-01-01 13:03:25 -07:00
86xx Merge commit 'v2.6.35-rc6' into devicetree/next 2010-07-24 09:49:13 -06:00
512x of/flattree: Add of_flat_dt_match() helper function 2011-01-01 13:03:25 -07:00
amigaone of/address: Clean up function declarations 2010-08-01 01:42:42 -06:00
cell fs: icache RCU free inodes 2011-01-07 17:50:26 +11: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 Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07: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 headers: kobject.h redux 2011-01-10 08:51:44 -08: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 KVM: PPC: Generic KVM PV guest support 2010-10-24 10:50:50 +02: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