Merge commit 'u-boot/master' into for-1.3.1
authorStefan Roese <sr@denx.de>
Tue, 11 Dec 2007 10:34:54 +0000 (11:34 +0100)
committerStefan Roese <sr@denx.de>
Tue, 11 Dec 2007 10:34:54 +0000 (11:34 +0100)
commit9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105
tree1afcc9c20c04e19870ab5e2996104877695c54a3
parent7cfc12a7dcfdb350e2ab76db4dafcc30f7e77c2b
parent41be969f4957115ed7b1fe8b890bfaee99d7a7a2
Merge commit 'u-boot/master' into for-1.3.1

Conflicts:

drivers/rtc/Makefile
MAKEALL
Makefile
drivers/hwmon/ds1775.c
drivers/rtc/Makefile
include/common.h
nand_spl/board/amcc/acadia/Makefile