From: Tony Lindgren Date: Thu, 23 Feb 2012 20:11:45 +0000 (-0800) Subject: Linux-omap rebuilt: Updated fixes, merged iomap and hsmmc changes X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32fc24ff667b42cba3de0f03cff67c75d36cc4c8;p=pandora-kernel.git Linux-omap rebuilt: Updated fixes, merged iomap and hsmmc changes $ git checkout -b tmp-rebuild-1330027875 linus $ git merge -m "Merge fixes fixes-non-critical cleanup soc hwmod pm dt omap1 omap4 driver hsmmc i2c board testing-board testing-misc cbus" fixes fixes-non-critical cleanup soc hwmod pm dt omap1 omap4 driver hsmmc i2c board testing-board testing-misc cbus $ git merge -s ours master $ git checkout master $ git merge tmp-rebuild-1330027875 To view the changes since the last rebuild, please do $ git diff ea2fd4b8fff6cd61c4c0042a067be2b2b01189be..7f675b9adf4c927e478bb399fb18637d3f896aed arch/arm/*omap*/ Merge branch 'master' into tmp-rebuild-1330027875 --- 32fc24ff667b42cba3de0f03cff67c75d36cc4c8 Reading git-diff-tree failed