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

diff --git a/Makefile b/Makefile
index 76f35a4d17cd6cea6cbaee08517cb44beeb6a23e..b32bd3badc7fe683e824de023b902cd06f61c424 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 VERSION = 1
 PATCHLEVEL = 3
 SUBLEVEL = 1
-EXTRAVERSION = -rc1
+EXTRAVERSION =
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 VERSION_FILE = $(obj)include/version_autogenerated.h
 

diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h
index bb1efdf6deac7cb0991a4e7e344314463f4a7553..58060a8c8a5a5830ebc2cdbf5945b1de3e413127 100644 (file)
--- a/include/configs/ads5121.h
+++ b/include/configs/ads5121.h
@@ -231,7 +231,7 @@
 #define CFG_I2C_SPEED          100000  /* I2C speed and slave address */
 #define CFG_I2C_SLAVE          0x7F
 #if 0
-#define CFG_I2C_NOPROBES       {{0,0x69}}      * Don't probe these addrs */
+#define CFG_I2C_NOPROBES       {{0,0x69}}      /* Don't probe these addrs */
 #endif
 
 /*