From: Tony Lindgren Date: Fri, 9 Mar 2012 20:38:36 +0000 (-0800) Subject: Linux-omap rebuilt: rebuilt one more time with updated hwmod branches from paul X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85244e0edd240da2004bb2ab7cbcbc67a336f20d;p=pandora-kernel.git Linux-omap rebuilt: rebuilt one more time with updated hwmod branches from paul $ git checkout -b tmp-rebuild-1331325486 linus $ git merge -m "Merge tmp-merge dt-part2 pm sr ams-delta omap4 driver board testing-board testing-misc cbus cleanup-timer cleanup-hwmod hwmod" tmp-merge dt-part2 pm sr ams-delta omap4 driver board testing-board testing-misc cbus cleanup-timer cleanup-hwmod hwmod $ git merge -s ours master $ git checkout master $ git merge tmp-rebuild-1331325486 To view the changes since the last rebuild, please do $ git diff be3759a0482cfa63a921be4e0f321d249f750959..27c5b5b5a5755ffea0dd7d1f4b1abeef1c3ef4f9 arch/arm/*omap*/ Merge branch 'master' into tmp-rebuild-1331325486 --- 85244e0edd240da2004bb2ab7cbcbc67a336f20d Reading git-diff-tree failed