From: Tony Lindgren <tony@atomide.com>
Date: Mon, 11 Jul 2011 13:29:33 +0000 (-0700)
Subject: Merge branch 'for_3.1/i2c-andy' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ec7218babc5257156d10f8a2f618efcd0033c63;p=pandora-kernel.git

Merge branch 'for_3.1/i2c-andy' of git://git./linux/kernel/git/khilman/linux-omap-pm into tmp-rebuild-1310390895

Conflicts:
	include/linux/i2c-omap.h
---

3ec7218babc5257156d10f8a2f618efcd0033c63
Reading git-diff-tree failed