From: Tony Lindgren Date: Fri, 9 Dec 2011 02:22:35 +0000 (-0800) Subject: Linux-omap rebuilt: Merged in omap4 PM and misc patches for merge window X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80d7a568d291153330d34ecea1c9eb5eb2c9e3b4;p=pandora-kernel.git Linux-omap rebuilt: Merged in omap4 PM and misc patches for merge window $ git checkout -b tmp-rebuild-1323397337 linus $ git merge -m "Merge fixes fixes-non-critical cleanup dt soc omap1 omap4 board driver testing-board testing-misc cbus" fixes fixes-non-critical cleanup dt soc omap1 omap4 board driver testing-board testing-misc cbus $ git merge -s ours master $ git checkout master $ git merge tmp-rebuild-1323397337 To view the changes since the last rebuild, please do $ git diff bbcefdf43ab82084c0d2c741a364bb9a554d4479..82c4d8b7de31c676616ae267d6d1e1d8bd10695a arch/arm/*omap*/ Merge branch 'master' into tmp-rebuild-1323397337 --- 80d7a568d291153330d34ecea1c9eb5eb2c9e3b4 Reading git-diff-tree failed