Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

diff --cc arch/arm/mach-omap2/board-2430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-apollon.c
Simple merge

diff --cc arch/arm/mach-omap2/board-h4.c
Simple merge

diff --cc arch/arm/mach-omap2/board-ldp.c
index c71580557c62d9f1315931a105a071c9d89111e8,92661e5df93e6ab38c1dec976cbb7aecf47f2288..e096f776f996cf51df6aeb5271764cc88d7368be
--- 1/arch/arm/mach-omap2/board-ldp.c
--- 2/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@@ -36,8 -34,10 +35,9 @@@
  #include <mach/common.h>
  #include <mach/gpmc.h>
  
 -#include <asm/io.h>
  #include <asm/delay.h>
  #include <mach/control.h>
+ #include <mach/usb.h>
  
  #include "mmc-twl4030.h"
  

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
Simple merge

diff --cc arch/arm/mach-omap2/devices.c
Simple merge

diff --cc arch/arm/plat-omap/Kconfig
Simple merge

diff --cc arch/arm/plat-omap/include/mach/cpu.h
Simple merge

diff --cc arch/arm/plat-omap/include/mach/system.h
index cb8c0ef30fba8e447288bffbbf9f1d85f7c3f363,8422845c5b6213974dc38812a8a388296c6c6d49..1060e345423b5f9bf3f8f6da7fafcc38b8ade3c0
--- 1/arch/arm/plat-omap/include/mach/system.h
--- 2/arch/arm/plat-omap/include/mach/system.h
+++ b/arch/arm/plat-omap/include/mach/system.h
@@@ -9,12 -9,14 +9,14 @@@
  #include <asm/mach-types.h>
  #include <mach/hardware.h>
  
 +#include <mach/prcm.h>
 +
  #ifndef CONFIG_MACH_VOICEBLUE
  #define voiceblue_reset()             do {} while (0)
+ #else
+ extern void voiceblue_reset(void);
  #endif
  
 -extern void omap_prcm_arch_reset(char mode);
 -
  static inline void arch_idle(void)
  {
        cpu_do_idle();