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)
Conflicts:
arch/arm/mach-omap2/pm34xx.c


Trivial merge