Linux-omap rebuilt: Updated to -rc1
authorTony Lindgren <tony@atomide.com>
Tue, 29 Mar 2011 23:42:29 +0000 (16:42 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 29 Mar 2011 23:42:29 +0000 (16:42 -0700)
$ git checkout -b tmp-rebuild-1301442011 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-1301442011

To view the changes since the last rebuild, please do
$ git diff 2c5a4996db3c41fc0f912609d3b198ff700dee47..b068f906e4e23880e1618aeb0b437760027ec7cc arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1301442011


Trivial merge