Merge branch 'master' of git://git.denx.de/u-boot-arm

author Wolfgang Denk <wd@denx.de>

Wed, 18 Feb 2009 23:46:32 +0000 (00:46 +0100)

committer Wolfgang Denk <wd@denx.de>

Wed, 18 Feb 2009 23:46:32 +0000 (00:46 +0100)
author Wolfgang Denk <wd@denx.de>
Wed, 18 Feb 2009 23:46:32 +0000 (00:46 +0100)
committer Wolfgang Denk <wd@denx.de>
Wed, 18 Feb 2009 23:46:32 +0000 (00:46 +0100)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc include/netdev.h
Simple merge
diff --cc lib_arm/board.c
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Wed, 18 Feb 2009 23:46:32 +0000 (00:46 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Wed, 18 Feb 2009 23:46:32 +0000 (00:46 +0100)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/netdev.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib_arm/board.c	patch \|	diff1 \|	diff2 \|	blob \| history