From: Tony Lindgren <tony@atomide.com>
Date: Fri, 1 Oct 2010 23:41:46 +0000 (-0700)
Subject: Linux-omap rebuilt: Merged in fixes, hwmod for testing, and some board updates
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e93832d1263c14da4679a861c568cc75e259fde3;p=pandora-kernel.git

Linux-omap rebuilt: Merged in fixes, hwmod for testing, and some board updates

$ git checkout -b tmp-rebuild-1285976362 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 for-next" for-next
$ git pull git://git.pwsan.com/linux-2.6 control_mcbsp_fix_2.6.37
$ git pull ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git pm-next-2
$ git pull ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git pm-hwmods
$ git pull git://dev.omapzoom.org/pub/scm/manju/kernel-omap3-dev.git omap_sparse_fixesv2
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1285976362

To view the changes since the last rebuild, please do
$ git diff 2365f1f7e5544b531ccd3e07fd06bb12bf7a62a7..27fdb079f26c4e207820247adcf41908095717db arch/arm/*omap*/
---

e93832d1263c14da4679a861c568cc75e259fde3
Reading git-diff-tree failed