Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
	drivers/video/exynos_fb.c

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc drivers/mtd/nand/mxc_nand.c
Simple merge

diff --cc drivers/video/exynos_fb.c
index dfe329fbc631e21630509dfea41ed6fab5c453ab,c0f1830dc9aed1c793231fa1e23c4f8a593fb73f..ed0823bf977af0a6bc1d91fae9240479513c4d6b
--- 1/drivers/video/exynos_fb.c
--- 2/drivers/video/exynos_fb.c
+++ b/drivers/video/exynos_fb.c
@@@ -38,32 -35,8 +38,22 @@@
  
  DECLARE_GLOBAL_DATA_PTR;
  
- int lcd_line_length;
- int lcd_color_fg;
- int lcd_color_bg;
- 
- void *lcd_base;
- void *lcd_console_address;
- 
- short console_col;
- short console_row;
- 
  static unsigned int panel_width, panel_height;
  
 +/*
 + * board_init_f(arch/arm/lib/board.c) calls lcd_setmem() which needs
 + * panel_info.vl_col, panel_info.vl_row and panel_info.vl_bpix to reserve
 + * FB memory at a very early stage, i.e even before exynos_fimd_parse_dt()
 + * is called. So, we are forced to statically assign it.
 + */
 +#ifdef CONFIG_OF_CONTROL
 +vidinfo_t panel_info  = {
 +      .vl_col = LCD_XRES,
 +      .vl_row = LCD_YRES,
 +      .vl_bpix = LCD_COLOR16,
 +};
 +#endif
 +
  static void exynos_lcd_init_mem(void *lcdbase, vidinfo_t *vid)
  {
        unsigned long palette_size;

diff --cc include/configs/am335x_evm.h
index dbd5ef327b3698b1fcac929155b67d08d0423022,f7f6d2533641f04973f147213980cbdfeb36d33d..ef00306a55ef09d8ecc78a7ca3dcdc4ad7d1bd3d
--- 1/include/configs/am335x_evm.h
--- 2/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@@ -352,8 -392,8 +392,9 @@@
  #define CONFIG_ARCH_MISC_INIT
  #define CONFIG_MUSB_GADGET
  #define CONFIG_MUSB_PIO_ONLY
 +#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT
  #define CONFIG_USB_GADGET_DUALSPEED
+ #define CONFIG_USB_GADGET_VBUS_DRAW   2
  #define CONFIG_MUSB_HOST
  #define CONFIG_AM335X_USB0
  #define CONFIG_AM335X_USB0_MODE       MUSB_PERIPHERAL

diff --cc include/lcd.h
Simple merge