From: Tony Lindgren <tony@atomide.com>
Date: Sun, 16 Aug 2009 15:53:44 +0000 (+0300)
Subject: Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~8^2^2~18^2~2^2^2~2^2^2^2^2~16^2^2~8^2^2~7^2~35
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51216ac43d437aea741b80f766b3bbc2e73cc537;p=pandora-kernel.git

Merge branch 'pm-upstream/fixes' of git://git./linux/kernel/git/khilman/linux-omap-pm

Conflicts:
	arch/arm/mach-omap2/serial.c
---

51216ac43d437aea741b80f766b3bbc2e73cc537
Reading git-diff-tree failed