Merge git://www.denx.de/git/u-boot

Conflicts:

	board/tqm5200/tqm5200.c

diff --cc board/tqm5200/tqm5200.c
index da4e2281a7fac249f159e952e3e144c5fea70f93,f33d17258ded641ee8c889be33acee964b603338..905a04338e70068f75b1325d648beca2fabdd415
--- 1/board/tqm5200/tqm5200.c
--- 2/board/tqm5200/tqm5200.c
+++ b/board/tqm5200/tqm5200.c
@@@ -444,6 -444,8 +444,9 @@@ ulong post_word_load (void
  #ifdef CONFIG_BOARD_EARLY_INIT_R
  int board_early_init_r (void)
  {
++
+       extern int usb_cpu_init(void);
+ 
  #ifdef CONFIG_PS2MULT
        ps2mult_early_init();
  #endif /* CONFIG_PS2MULT */