Linux-omap rebuilt: Rebuilt with fixed up branches for v3.18
authorTony Lindgren <tony@atomide.com>
Wed, 10 Sep 2014 03:04:17 +0000 (20:04 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 10 Sep 2014 03:04:17 +0000 (20:04 -0700)
$ git checkout -b tmp-rebuild-1410318252 linus
$ git merge -m "Merge omap-for-v3.18/tmp-merge" omap-for-v3.18/tmp-merge
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1410318252

To view the changes since the last rebuild, please do
$ git diff 1f9433ea425c7239b2e228773366d94a55d1054c..7745fa03edf02ddbd70052671d4f2c254b850f51 arch/arm/*omap*/


Trivial merge