From: Tony Lindgren <tony@atomide.com>
Date: Tue, 6 Mar 2012 22:49:59 +0000 (-0800)
Subject: Merge branch 'i2c' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=620374d1cbddf5eb15e67393ceb6986527db5f08;p=pandora-kernel.git

Merge branch 'i2c' into tmp-merge

Conflicts:
	arch/arm/plat-omap/omap_device.c
---

620374d1cbddf5eb15e67393ceb6986527db5f08
Reading git-diff-tree failed