Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/plat-omap/include/mach/common.h
	arch/arm/plat-omap/include/mach/pm.h

diff --cc Makefile
Simple merge

diff --cc arch/arm/plat-omap/include/mach/pm.h
index 15c19f0dbb54417caefff075ebed385a085756f7,37e2f0f38b462bb803bd6615dc6c070909993a40..faf5b48c61d5cab918d7350c760f85bb0ba3c18a
--- 1/arch/arm/plat-omap/include/mach/pm.h
--- 2/arch/arm/plat-omap/include/mach/pm.h
+++ b/arch/arm/plat-omap/include/mach/pm.h
@@@ -107,9 -107,8 +107,9 @@@
  #if     !defined(CONFIG_ARCH_OMAP730) && \
        !defined(CONFIG_ARCH_OMAP15XX) && \
        !defined(CONFIG_ARCH_OMAP16XX) && \
 -      !defined(CONFIG_ARCH_OMAP24XX)
 +      !defined(CONFIG_ARCH_OMAP24XX) && \
 +      !defined(CONFIG_ARCH_OMAP34XX)
- #error "Power management for this processor not implemented yet"
+ #warning "Power management for this processor not implemented yet"
  #endif
  
  #ifndef __ASSEMBLER__