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

Conflicts:

	include/asm-microblaze/microblaze_intc.h
	include/linux/stat.h

diff --cc README
Simple merge

diff --cc common/Makefile
Simple merge

diff --cc cpu/microblaze/start.S
Simple merge

diff --cc include/configs/xupv2p.h
Simple merge

diff --cc include/linux/stat.h
index 39386f1220a03ff604e11eba30f36fb614b2cdeb,43fd53fc98cf8b5644c49b3c7cc5235278aa0365..37f2924df18881bf6569c21607cc9d19518f794a
--- 1/include/linux/stat.h
--- 2/include/linux/stat.h
+++ b/include/linux/stat.h
@@@ -67,8 -67,7 +67,8 @@@ struct stat 
  
  #endif        /* __PPC__ */
  
- #if defined (__ARM__) || defined (__I386__) || defined (__M68K__) || defined (__blackfin__) ||\
 -#if defined (__ARM__) || defined (__I386__) || defined (__M68K__) || defined (__bfin__)
++#if defined (__ARM__) || defined (__I386__) || defined (__M68K__) || defined (__bfin__) ||\
 +      defined (__microblaze__)
  
  struct stat {
        unsigned short st_dev;