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

diff --cc Makefile
Simple merge

diff --cc include/configs/at91cap9adk.h
index 0ef3554216dba8cca9f2cfbb9c0c56787fe11ae1,219eea3114ab68b62ed97082b8974ffd1ecb6b78..27f8fd1a16fb598f2ea1f525ec7ef5d4038457dd
--- 1/include/configs/at91cap9adk.h
--- 2/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@@ -130,10 -130,8 +130,11 @@@
  #define CONFIG_SYS_MAX_NAND_DEVICE            1
  #define CONFIG_SYS_NAND_BASE                  0x40000000
  #define CONFIG_SYS_NAND_DBW_8                 1
+ #endif
  
 +#define CONFIG_SYS_64BIT_VSPRINTF             /* needed for nand_util.c */
 +#endif
 +
  /* Ethernet */
  #define CONFIG_MACB                   1
  #define CONFIG_RMII                   1