From: Tony Lindgren <tony@atomide.com>
Date: Fri, 16 Dec 2011 22:01:03 +0000 (-0800)
Subject: Merge branch 'for_3.3/uart/runtime-pm' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.3-rc1~137^2~3^2^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f760f1abcd1a36b52776c90f6a601dd90f06ecb;p=pandora-kernel.git

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

7f760f1abcd1a36b52776c90f6a601dd90f06ecb
Reading git-diff-tree failed