From: Tony Lindgren <tony@atomide.com>
Date: Mon, 11 Jul 2011 13:29:47 +0000 (-0700)
Subject: Linux-omap rebuilt: Merged in i2c changes again
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdd036809c7f582ce193ba63d36d745bfb81e0f8;p=pandora-kernel.git

Linux-omap rebuilt: Merged in i2c changes again

$ git checkout -b tmp-rebuild-1310390895 linus
$ git merge -m "Merge omap-fixes-for-linus devel-board tmp-merge fixes-part-2 twl-asoc omap-testing cbus" omap-fixes-for-linus devel-board tmp-merge fixes-part-2 twl-asoc omap-testing cbus
$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git for_3.1/i2c-andy
$ git pull git://git.pwsan.com/linux-2.6 prcm-devel-3.1
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1310390895

To view the changes since the last rebuild, please do
$ git diff 2f74101fb8da4337595ac3ba26b617406d046b1b..5eb76c2c55f1188f45583a3a33854e8f84d9c898 arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1310390895
---

fdd036809c7f582ce193ba63d36d745bfb81e0f8
Reading git-diff-tree failed