Merge branch 'master' of ../work into next

author Wolfgang Denk <wd@denx.de>

Mon, 7 Dec 2009 22:42:33 +0000 (23:42 +0100)

committer Wolfgang Denk <wd@denx.de>

Mon, 7 Dec 2009 22:42:33 +0000 (23:42 +0100)
author Wolfgang Denk <wd@denx.de>
Mon, 7 Dec 2009 22:42:33 +0000 (23:42 +0100)
committer Wolfgang Denk <wd@denx.de>
Mon, 7 Dec 2009 22:42:33 +0000 (23:42 +0100)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Mon, 7 Dec 2009 22:42:33 +0000 (23:42 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Mon, 7 Dec 2009 22:42:33 +0000 (23:42 +0100)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history