From: Tony Lindgren <tony@atomide.com>
Date: Mon, 21 Mar 2011 15:33:16 +0000 (-0700)
Subject: Merge omap-for-linus devel-fixes for-next omap-testing cbus testing-i2c
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6503cade73cec91b9c023d30970fba11608c83b7;p=pandora-kernel.git

Merge omap-for-linus devel-fixes for-next omap-testing cbus testing-i2c

Merge branches 'omap-for-linus', 'devel-fixes', 'for-next', 'omap-testing', 'cbus' and 'testing-i2c' into tmp-rebuild-1300721502

Conflicts:
	drivers/i2c/busses/i2c-omap.c
---

6503cade73cec91b9c023d30970fba11608c83b7
Reading git-diff-tree failed