Linux-omap rebuilt:

$ git checkout -b tmp-rebuild-1436191363 linus
$ git merge -m "Merge for-next" for-next
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1436191363

To view the changes since the last rebuild, please do
$ git diff c4a11dae2a7e6b27416363d2bbf8d37d929aa7c3..ae745302c0a3e2b5b768690f631fc14db44467e7 arch/arm/*omap*/