From: Tony Lindgren Date: Mon, 27 Sep 2010 20:24:09 +0000 (-0700) Subject: Linux-omap rebuilt: Merged in more branches from Paul X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd09a217098314a625594a396021193a2899ed9b;p=pandora-kernel.git Linux-omap rebuilt: Merged in more branches from Paul $ git checkout -b tmp-rebuild-1285619013 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 merge -s ours master $ git checkout master $ git merge tmp-rebuild-1285619013 To view the changes since the last rebuild, please do $ git diff a942cf16c7d403bc5e22d4481ac5a47d0f9c8536..e8f72fad2745cbcfd6bc620da3e4847c7b48188f arch/arm/*omap*/ --- fd09a217098314a625594a396021193a2899ed9b Reading git-diff-tree failed