Merge git://www.denx.de/git/u-boot

Conflicts:

	CREDITS

diff --cc CREDITS
index e94372dd0c1a26a36d7df884c9bade99f8427489,0953e7b952ada10f4e438d71e37a708159023624..13150aec65b20b2cba2532a95da6669d8c189347
--- 1/CREDITS
--- 2/CREDITS
+++ b/CREDITS
@@@ -117,7 -117,7 +117,7 @@@ N: Arun Dharanka
  E: ADharankar@ATTBI.Com
  D: threads / scheduler example code
  
--N: Kári Davíðsson
++N: K?ri Dav??sson
  E: kd@flaga.is
  D: FLAGA DM Support
  
@@@ -143,7 -143,7 +143,7 @@@ E: info@elste.or
  D: Port for the ModNET50 Board, NET+50 CPU Port
  W: http://www.imms.de
  
--N: Daniel Engström
++N: Daniel Engstr?m
  E: daniel@omicron.se
  D: x86 port, Support for sc520_cdp board
  
@@@ -310,7 -334,7 +334,7 @@@ N: Frank Morau
  E: frank.morauf@salzbrenner.com
  D: Support for Embedded Planet RPX Super Board
  
--N: David Müller
++N: David M?ller
  E: d.mueller@elsoft.ch
  D: Support for Samsung ARM920T SMDK2410 eval board
  
@@@ -464,23 -499,3 +499,8 @@@ N: Alex Zuepk
  E: azu@sysgo.de
  D: Overall improvements on StrongARM, ARM720TDMI; Support for Tuxscreen; initial PCMCIA support for ARM
  W: www.elinos.com
- N: James MacAulay
- E: james.macaulay@amirix.com
- D: Suppport for Amirix AP1000
- W: www.amirix.com
- 
- N: Timur Tabi
- E: timur@freescale.com
- D: Support for MPC8349E-mITX
- W: www.freescale.com
- 
- N: Michal Simek
- E: monstr@monstr.eu
- D: Support for Microblaze, ML401, XUPV2P board
- W: www.monstr.eu
- 
 +
- D: Support for SuperH, MS7750SE01 , MS7780SE03  board
- W: www.nigauri.org
 +N: Nobuhiro Iwamatsu
 +E: iwamatsu@nigauri.org
++D: Support for SuperH, MS7750SE01 and  MS7722SE01 boards.
++W: http://www.nigauri.org/~iwamatsu/

diff --cc Makefile
Simple merge

diff --cc common/cmd_bootm.c
Simple merge

diff --cc drivers/Makefile
index a3a9986cf4e78cbb897a77cd54de5c824a0ad593,6bf05ccad19696164b1f3f0a66b7812f39be659f..fe32a740983e4492e25b20580e53f5064bf59638
mode 100644,100755..100755
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -41,9 -41,9 +41,9 @@@ COBJS = 3c589.o 5701rls.o ali512x.o at4
          rtl8019.o rtl8139.o rtl8169.o \
          s3c4510b_eth.o s3c4510b_uart.o \
          sed13806.o sed156x.o \
 -        serial.o serial_max3100.o \
 +        serial.o serial_max3100.o serial_sh.o \
          serial_pl010.o serial_pl011.o serial_xuartlite.o \
-         sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
+         sil680.o sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
          status_led.o sym53c8xx.o systemace.o ahci.o \
          ti_pci1410a.o tigon3.o tsec.o \
          tsi108_eth.o tsi108_i2c.o tsi108_pci.o \