Merge branch 'depends/rmk/devel-stable' into for-next

Same conflict resolution as sfr has been using on -next.

Conflicts:
	arch/arm/mach-at91/setup.c

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-at91/setup.c
index 242c26b2368d6b5549f18c7f19d995884084b68f,cf98a8f94dc5afd19ee1c1471b79483eaa273dcb..8bdcc3cb6012bf723ab46c27ca44f63d81d22da9
--- 1/arch/arm/mach-at91/setup.c
--- 2/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@@ -75,24 -73,9 +75,6 @@@ static struct map_desc at91_io_desc __i
        .type           = MT_DEVICE,
  };
  
- void __iomem *at91_ioremap(unsigned long p, size_t size, unsigned int type)
- {
-       if (p >= AT91_BASE_SYS && p <= (AT91_BASE_SYS + SZ_16K - 1))
-               return (void __iomem *)AT91_IO_P2V(p);
- 
-       return __arm_ioremap_caller(p, size, type, __builtin_return_address(0));
- }
- EXPORT_SYMBOL(at91_ioremap);
- 
- void at91_iounmap(volatile void __iomem *addr)
- {
-       unsigned long virt = (unsigned long)addr;
- 
-       if (virt >= VMALLOC_START && virt < VMALLOC_END)
-               __iounmap(addr);
- }
- EXPORT_SYMBOL(at91_iounmap);
 -#define AT91_DBGU0    0xfffff200
 -#define AT91_DBGU1    0xffffee00
--
  static void __init soc_detect(u32 dbgu_base)
  {
        u32 cidr, socid;

diff --cc arch/arm/mach-pxa/mioa701.c
Simple merge

diff --cc arch/arm/mach-pxa/poodle.c
Simple merge

diff --cc arch/arm/mach-pxa/spitz.c
Simple merge

diff --cc arch/arm/mach-pxa/tosa.c
Simple merge