Tony Lindgren 7f760f1abc Merge branch 'for_3.3/uart/runtime-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into uart ... Conflicts: arch/arm/mach-omap2/pm34xx.c		2011-12-16 14:01:03 -08:00
..
mach	Merge branch 'for_3.3/uart/runtime-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into uart	2011-12-16 14:01:03 -08:00