Merge branch 'for_3.3/uart/runtime-pm' of git://git.kernel.org/pub/scm/linux/kernel...
authorTony Lindgren <tony@atomide.com>
Fri, 16 Dec 2011 22:01:03 +0000 (14:01 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 16 Dec 2011 22:01:03 +0000 (14:01 -0800)
commit7f760f1abcd1a36b52776c90f6a601dd90f06ecb
treec5f29a48b528ecc352dbc5c2a246d7860177ac59
parent9d297f5ee1b92a84e2cd6c547c3ac1f893128359
parentda27468655540b083525177f5dc6f3b1f6e3b869
Merge branch 'for_3.3/uart/runtime-pm' of git://git./linux/kernel/git/khilman/linux-omap-pm into uart

Conflicts:
arch/arm/mach-omap2/pm34xx.c
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/common.h
arch/arm/mach-omap2/cpuidle34xx.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/pm34xx.c