From: Michal Simek <monstr@monstr.eu>
Date: Mon, 7 May 2007 22:32:35 +0000 (+0200)
Subject: Merge git://www.denx.de/git/u-boot
X-Git-Tag: v1.3.0-rc1~76^2~4^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c4bd60de15d79ddfc0cf3170a55847b2025d93f;p=pandora-u-boot.git

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

Conflicts:

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

3c4bd60de15d79ddfc0cf3170a55847b2025d93f
diff --cc include/linux/stat.h
index 39386f1220a,43fd53fc98c..37f2924df18
--- a/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;