Merge branch 'master' into next

author Wolfgang Denk <wd@denx.de>

Tue, 29 Jun 2010 23:02:11 +0000 (01:02 +0200)

committer Wolfgang Denk <wd@denx.de>

Tue, 29 Jun 2010 23:02:11 +0000 (01:02 +0200)
author Wolfgang Denk <wd@denx.de>
Tue, 29 Jun 2010 23:02:11 +0000 (01:02 +0200)
committer Wolfgang Denk <wd@denx.de>
Tue, 29 Jun 2010 23:02:11 +0000 (01:02 +0200)
diff --cc Makefile
Simple merge
diff --cc board/evb64260/mpsc.c
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Tue, 29 Jun 2010 23:02:11 +0000 (01:02 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Tue, 29 Jun 2010 23:02:11 +0000 (01:02 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
board/evb64260/mpsc.c	patch \|	diff1 \|	diff2 \|	blob \| history