From: Tony Lindgren <tony@atomide.com>
Date: Tue, 5 Oct 2010 17:00:40 +0000 (-0700)
Subject: Merge branch 'pm-hwmods' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman... 
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2aaf7e59595e23ab99efed26e095c68298deafc0;p=pandora-kernel.git

Merge branch 'pm-hwmods' of ssh:///linux/kernel/git/khilman/linux-omap-pm into omap-for-linus

Conflicts:
	arch/arm/mach-omap2/serial.c
	arch/arm/plat-omap/common.c
---

2aaf7e59595e23ab99efed26e095c68298deafc0
Reading git-diff-tree failed