Linux-omap rebuilt: Merged in the final changes for v2.6.39
authorTony Lindgren <tony@atomide.com>
Mon, 14 Mar 2011 18:56:45 +0000 (11:56 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 14 Mar 2011 18:56:45 +0000 (11:56 -0700)
$ git checkout -b tmp-rebuild-1300128996 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-1300128996

To view the changes since the last rebuild, please do
$ git diff a5abba989deceb731047425812d268daf7536575..4e9659acaff71a66dfcf3796ec3f19503d9f855b arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1300128996


Trivial merge