From: Tony Lindgren <tony@atomide.com>
Date: Wed, 9 Dec 2009 01:47:23 +0000 (-0800)
Subject: Merge tomi/for-next
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5206a030a82b157d97848693ef61691c3868cdfd;p=pandora-kernel.git

Merge tomi/for-next

Merge remote branch 'tomi/for-next' into tmp-rebuild-1260323192

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

5206a030a82b157d97848693ef61691c3868cdfd
Reading git-diff-tree failed