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
#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__