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

Conflicts:

	Makefile
	onenand_ipl/onenand_ipl.h
	onenand_ipl/onenand_read.c

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

diff --cc Makefile
Simple merge

diff --cc onenand_ipl/onenand_ipl.h
index e422744,7ebb3e3..70dcb53
--- 1/onenand_ipl/onenand_ipl.h
--- 2/onenand_ipl/onenand_ipl.h
+++ b/onenand_ipl/onenand_ipl.h
@@@ -28,15 -28,8 +28,14 @@@
  
  #define THIS_ONENAND(a)         (CONFIG_SYS_ONENAND_BASE + (a))
  
- #define READ_INTERRUPT()                                                \
-                               onenand_readw(ONENAND_REG_INTERRUPT)
+ #define READ_INTERRUPT()      onenand_readw(ONENAND_REG_INTERRUPT)
  
 +enum {
 +      ONENAND_USE_DEFAULT,
 +      ONENAND_USE_GENERIC,
 +      ONENAND_USE_BOARD,
 +};
 +
  extern int (*onenand_read_page)(ulong block, ulong page,
                                u_char *buf, int pagesize);
  extern int onenand_read_block(unsigned char *buf);

diff --cc onenand_ipl/onenand_read.c
Simple merge