From: Tony Lindgren <tony@atomide.com>
Date: Fri, 8 Jul 2011 13:04:00 +0000 (-0700)
Subject: Linux-omap rebuilt: Merged in minimal 4460 changes
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0446ee2f254bfed1a17ea2dd70724e956d2a928;p=pandora-kernel.git

Linux-omap rebuilt: Merged in minimal 4460 changes

$ git checkout -b tmp-rebuild-1310130224 linus
$ git merge -m "Merge omap-fixes-for-linus devel-cleanup devel-fixes tmp-merge 4460 omap-testing cbus" omap-fixes-for-linus devel-cleanup devel-fixes tmp-merge 4460 omap-testing cbus
$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.g for_3.1/i2c-andy
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1310130224

To view the changes since the last rebuild, please do
$ git diff 3047df9b1600c1b03acc6c6d50ed6d18caaa2df4..2d883f4fdb98a9d53d2962f227e2f3f395b158b7 arch/arm/*omap*/

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

a0446ee2f254bfed1a17ea2dd70724e956d2a928
Reading git-diff-tree failed