Linux-omap rebuilt: Updated to -rc4
authorTony Lindgren <tony@atomide.com>
Tue, 19 Apr 2011 06:45:57 +0000 (23:45 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 19 Apr 2011 06:45:57 +0000 (23:45 -0700)
$ git checkout -b tmp-rebuild-1303195548 linus
$ git merge -m "Merge for-next omap-testing cbus testing-i2c" for-next omap-testing cbus testing-i2c
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1303195548

To view the changes since the last rebuild, please do
$ git diff cf643cd7616ad12a3eda99d451ec0f184443430e..0ef925ee9d4656db020f8a8503f72f5302cf0eb7 arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1303195548


Trivial merge