Linux-omap rebuilt: clock changes and multi-omap added to for-next
authorTony Lindgren <tony@atomide.com>
Wed, 27 Jan 2010 19:43:44 +0000 (11:43 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 27 Jan 2010 19:43:44 +0000 (11:43 -0800)
$ git checkout -b tmp-rebuild-1264621416 linus
$ git merge -m "Merge omap-fixes" omap-fixes
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge for-next" for-next
$ git merge -m "Merge cbus" cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1264621416

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


Trivial merge