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

Conflicts:

	common/env_onenand.c

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

diff --cc Makefile
Simple merge

diff --cc common/env_onenand.c
index ce243cf,cf997bf..7ccce4d
--- 1/common/env_onenand.c
--- 2/common/env_onenand.c
+++ b/common/env_onenand.c
@@@ -107,14 -104,10 +105,15 @@@ int saveenv(void
        struct erase_info instr = {
                .callback       = NULL,
        };
 -      size_t retlen;
 +      size_t retlen, len;
 +
 +      len = CONFIG_ENV_SIZE;
 +
 +      if (len < mtd->erasesize)
 +              len = ALIGN(len, mtd->erasesize);
  
 -      instr.len = CONFIG_ENV_SIZE;
 +      instr.len = len;
+ #ifdef CONFIG_ENV_ADDR_FLEX
        if (FLEXONENAND(this)) {
                env_addr = CONFIG_ENV_ADDR_FLEX;
                instr.len = CONFIG_ENV_SIZE_FLEX;