Merge branch 'master' of git://88.191.163.10/u-boot-arm

Fixup an easy conflict over adding the clk_get prototype and USB_OTG
defines for am33xx having moved.

Conflicts:
	arch/arm/include/asm/arch-am33xx/hardware.h

Signed-off-by: Tom Rini <trini@ti.com>

diff --cc .gitignore
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc arch/arm/include/asm/arch-am33xx/hardware.h
index 2dfcc2e65bef0297ecb0a402b421720dbc946fbe,2055b254948995da637dfe779d1ae39b50921237..ee5fce0da1caef5677d66d565c66d0b956beb61e
--- 1/arch/arm/include/asm/arch-am33xx/hardware.h
--- 2/arch/arm/include/asm/arch-am33xx/hardware.h
+++ b/arch/arm/include/asm/arch-am33xx/hardware.h
@@@ -74,9 -68,4 +68,5 @@@
  /* CPSW Config space */
  #define CPSW_BASE                     0x4A100000
  
- /* OTG */
- #define USB0_OTG_BASE                 0x47401000
- #define USB1_OTG_BASE                 0x47401800
- 
 +int clk_get(int clk);
  #endif /* __AM33XX_HARDWARE_H */

diff --cc boards.cfg
Simple merge