From: Tony Lindgren <tony@atomide.com>
Date: Mon, 11 Jul 2011 11:23:44 +0000 (-0700)
Subject: Linux-omap rebuilt: Updated cleanup and fixes
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f74101fb8da4337595ac3ba26b617406d046b1b;p=pandora-kernel.git

Linux-omap rebuilt: Updated cleanup and fixes

$ git checkout -b tmp-rebuild-1310383408 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.pwsan.com/linux-2.6 prcm-devel-3.1
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1310383408

To view the changes since the last rebuild, please do
$ git diff e4eacbe04eb4831dab1ecbeeaceec22592ad6f25..059e3b0e20665e5650b2881314e91450bb9ec415 arch/arm/*omap*/

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

2f74101fb8da4337595ac3ba26b617406d046b1b
Reading git-diff-tree failed