Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/ofcons
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 20 Jul 2007 16:18:08 +0000 (09:18 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 20 Jul 2007 16:18:08 +0000 (09:18 -0700)
commit2cb7e714229681408e323852bed939989faf6991
tree552b78fa5830a0337594f9fbab5f1dc0306e93cd
parentd638d4990bfb99998420e78e8fd4607bca5cf8d0
parent3f23de10f283819bcdc0d2282e8b5b14c2e96d3b
Merge branch 'master' of git://git./linux/kernel/git/sfr/ofcons

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/ofcons:
  Create drivers/of/platform.c
  Create linux/of_platorm.h
  [SPARC/64] Rename some functions like PowerPC
  Begin consolidation of of_device.h
  Begin to consolidate of_device.c
  Consolidate of_find_node_by routines
  Consolidate of_get_next_child
  Consolidate of_get_parent
  Consolidate of_find_property
  Consolidate of_device_is_compatible
  Start split out of common open firmware code
  Split out common parts of prom.h
arch/sparc64/kernel/power.c