Linux-omap rebuilt: Updated with pending branches
authorTony Lindgren <tony@atomide.com>
Wed, 12 Jun 2013 18:19:28 +0000 (11:19 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 12 Jun 2013 18:19:28 +0000 (11:19 -0700)
$ git checkout -b tmp-rebuild-1371061162 linus
$ git merge -m "Merge omap-for-v3.11/tmp-merge" omap-for-v3.11/tmp-merge
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1371061162

To view the changes since the last rebuild, please do
$ git diff 64cd94b3873ef6c25732679946a1e1fb625726f5..9d47133e03ceb1c82e709256addcdafac446eca6 arch/arm/*omap*/


Trivial merge