From: Tony Lindgren <tony@atomide.com>
Date: Tue, 27 Apr 2010 01:30:07 +0000 (-0700)
Subject: Linux-omap rebuilt: Merged in i2c-omap-for-ben branch and cleaned up cbus branch
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=104a77440f05430f29f9d3f4ecb88c1536819585;p=pandora-kernel.git

Linux-omap rebuilt: Merged in i2c-omap-for-ben branch and cleaned up cbus branch

$ git checkout -b tmp-rebuild-1272331795 linus
$ git merge -m "Merge cbus" cbus
$ git merge -m "Merge omap-fixes" omap-fixes
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge i2c-omap-for-ben" i2c-omap-for-ben
$ git merge -m "Merge for-next" for-next
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1272331795

To view the changes since the last rebuild, please do
$ git diff 7df1702e6cc94c3b3a3ebb69b6462bfaad9050da..d5ecba294c02078aec93474d15ee5b57ada4a7ae arch/arm/*omap*/
---

104a77440f05430f29f9d3f4ecb88c1536819585
Reading git-diff-tree failed