kernel_optimize_test/arch/sparc/prom
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
..
bootstr_32.c sparc: fix sparse warnings in arch/sparc/prom for 32 bit build 2011-01-03 12:15:12 -08:00
bootstr_64.c
cif.S sparc64: Get rid of indirect p1275 PROM call buffer. 2010-08-23 23:10:57 -07:00
console_32.c sparc: prom: Sanitize return value from prom_nbputchar() 2010-12-12 14:50:42 -08:00
console_64.c sparc: Eliminate prom_stdin. 2010-12-12 14:57:53 -08:00
init_32.c sparc: explicitly cast negative phandle checks to s32 2011-01-03 20:02:06 -07:00
init_64.c Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2011-01-10 08:57:03 -08:00
Makefile sparc: drop prom/palloc.c 2011-01-02 22:19:38 -08:00
memory.c of/sparc: convert various prom_* functions to use phandle 2010-10-09 02:33:34 -06:00
misc_32.c sparc: fix sparse warnings in arch/sparc/prom for 32 bit build 2011-01-03 12:15:12 -08:00
misc_64.c sparc64: Delete prom_setcallback(). 2010-11-16 12:50:19 -08:00
mp.c sparc: remove unused prom cpu functions 2011-01-02 22:19:39 -08:00
p1275.c Fix IRQ flag handling naming 2010-10-07 14:08:55 +01:00
printf.c sparc: Write to prom console using indirect buffer. 2010-11-30 20:15:58 -08:00
ranges.c sparc: fix sparse warnings in arch/sparc/prom for 32 bit build 2011-01-03 12:15:12 -08:00
segment.c sparc: remove redundant return statements 2010-02-10 11:47:57 -08:00
tree_32.c Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2011-01-10 08:57:03 -08:00
tree_64.c sparc: explicitly cast negative phandle checks to s32 2011-01-03 20:02:06 -07:00