From: Wolfgang Denk Date: Fri, 27 Apr 2012 11:03:26 +0000 (+0200) Subject: Merge branch 'marex@denx.de' of git://git.denx.de/u-boot-staging X-Git-Tag: v2012.07-rc1~160 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e654fac2e6914cb27ae2cb855db5484bde38e107;p=kernel%2Fu-boot.git Merge branch 'marex@denx.de' of git://git.denx.de/u-boot-staging * 'marex@denx.de' of git://git.denx.de/u-boot-staging: CMD: CONFIG_CMD_SETECPR -> CONFIG_CMD_SETEXPR on omap3_logic CMD: Fix CONFIG_CMD_SAVEBP_WRITE_SIZE -> CONFIG_CMD_SPL_WRITE_SIZE CMD: Fix typo CMD_FSL -> CMD_MFSL in readme HWW1U1A: Fix CMD_SHA1 -> CMD_SHA1SUM CMD: Remove CMD_LOG, it's unused CMD: Fix typo KGBD -> KGDB on debris board CMD: Drop CONFIG_CMD_EMMC, it's not used CMD: Drop CONFIG_CMD_DFL, it's not used CMD: Drop CMD_DCR, it's not used CMD: Drop CMD_CAN, it's not used CMD: Remove CMD_AUTOSCRIPT, it's not used AT91: Drop AT91_SPIMUX command from cmd_all --- e654fac2e6914cb27ae2cb855db5484bde38e107