Merge branch 'ixp4xx' into devel

Conflicts:

	include/asm-arm/arch-ixp4xx/io.h

diff --cc arch/arm/mach-ixp4xx/common.c
Simple merge

diff --cc include/asm-arm/arch-ixp4xx/io.h
index b27c910adf9d58a4935763ea62e9eaf247aedc1e,b8b3cbcd2d3af0853312e699066f41d2c381174e..c72f9d79417cbc3208bdc0574bb6784685605523
--- 1/include/asm-arm/arch-ixp4xx/io.h
--- 2/include/asm-arm/arch-ixp4xx/io.h
+++ b/include/asm-arm/arch-ixp4xx/io.h
@@@ -59,10 -59,10 +59,10 @@@ extern int ixp4xx_pci_write(u32 addr, u
   * fallback to the default.
   */
  static inline void __iomem *
 -__ixp4xx_ioremap(unsigned long addr, size_t size, unsigned long flags)
 +__ixp4xx_ioremap(unsigned long addr, size_t size, unsigned int mtype)
  {
-       if((addr < 0x48000000) || (addr > 0x4fffffff))
+       if((addr < PCIBIOS_MIN_MEM) || (addr > 0x4fffffff))
 -              return __ioremap(addr, size, flags);
 +              return __arm_ioremap(addr, size, mtype);
  
        return (void *)addr;
  }