From: Tony Lindgren <tony@atomide.com>
Date: Sun, 10 Jul 2011 20:07:29 +0000 (-0700)
Subject: Linux-omap rebuilt: Merged in PRCM changes for testing
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4eacbe04eb4831dab1ecbeeaceec22592ad6f25;p=pandora-kernel.git

Linux-omap rebuilt: Merged in PRCM changes for testing

$ git checkout -b tmp-rebuild-1310328401 linus
$ git merge -m "Merge omap-fixes-for-linus devel-board devel-fixes twl-asoc 4460 omap-testing cbus" omap-fixes-for-linus devel-board devel-fixes twl-asoc 4460 omap-testing cbus
$ git pull git://git.pwsan.com/linux-2.6 prcm-cleanup-3.1
$ git pull git://git.pwsan.com/linux-2.6 prcm-fixes-3.1
$ 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-1310328401

To view the changes since the last rebuild, please do
$ git diff a0446ee2f254bfed1a17ea2dd70724e956d2a928..393fc29662905187ea11b1a0caa5d28c8fbd06ff arch/arm/*omap*/

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

e4eacbe04eb4831dab1ecbeeaceec22592ad6f25
Reading git-diff-tree failed