Merge with git://git.kernel.org/pub/scm/boot/u-boot/galak/u-boot.git#device_tree
authorWolfgang Denk <wd@pollux.denx.de>
Thu, 26 Oct 2006 14:18:49 +0000 (16:18 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 26 Oct 2006 14:18:49 +0000 (16:18 +0200)

Trivial merge