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

arch/arm/cpu/armv7/mx51/timer.c

@@ -89,7 +89,7 @@ ulong get_timer_masked(void)
 		timestamp += ((0xFFFFFFFF / (CONFIG_MX51_CLK32 / CONFIG_SYS_HZ))
 				- lastinc) + val;
 	lastinc = val;
-	return val;
+	return timestamp;
 }
 
 ulong get_timer(ulong base)

common/cmd_mmc.c

@@ -133,7 +133,7 @@ int do_mmcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 U_BOOT_CMD(
 	mmcinfo, 2, 0, do_mmcinfo,
 	"display MMC info",
-	"<dev num>\n
+	"<dev num>\n"
         "    - device number of the device to dislay info of\n"
 	""
 );