Linux-omap rebuilt: Updated to -rc6, updated cleanup
authorTony Lindgren <tony@atomide.com>
Mon, 9 May 2011 15:16:25 +0000 (08:16 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 9 May 2011 15:16:25 +0000 (08:16 -0700)
$ git checkout -b tmp-rebuild-1304954172 linus
$ git merge -m "Merge for-next omap-testing cbus testing-i2c" for-next omap-testing cbus testing-i2c
$ git pull git://git.linaro.org/people/nico/linux zImage_fixes
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1304954172

To view the changes since the last rebuild, please do
$ git diff ede38d18baaa52c2b86b664a7fb4c02f29393e4e..6dcabb41a30c9d7b34bece3ba417746f6bc0fce7 arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1304954172


Trivial merge