From: Tony Lindgren <tony@atomide.com>
Date: Fri, 22 Jun 2012 09:09:42 +0000 (-0700)
Subject: Merge branch 'tmp-merge'
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a2303e4edffa919f12c5662d0c15b5248915c97;p=pandora-kernel.git

Merge branch 'tmp-merge'

Conflicts:
	arch/arm/mach-omap2/dsp.c
	arch/arm/mach-omap2/io.c
---

1a2303e4edffa919f12c5662d0c15b5248915c97
Reading git-diff-tree failed