Merge branch 'master' of git://git.denx.de/u-boot-fdt
authorWolfgang Denk <wd@denx.de>
Sat, 15 Oct 2011 20:00:01 +0000 (22:00 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 15 Oct 2011 20:00:01 +0000 (22:00 +0200)
commit7bf5228ce190e1659eee0d99bbf4fc5d417a2369
treefc826219272af416f02aef7c8f2670d1b6f86de7
parente140aad18af5536a25c9ec2055ab53e9e4bc0721
parenta2c1229c39e39d9a5ff90055d78b8de061943097
Merge branch 'master' of git://git.denx.de/u-boot-fdt

* 'master' of git://git.denx.de/u-boot-fdt:
  powerpc/85xx: use fdt_create_phandle() to create the Fman firmware phandles
  fdt: update fdt_alloc_phandle to use fdt_get_phandle
  fdt: check for fdt errors in fdt_create_phandle
  fdt: Add a do_fixup_by_path_string() function