Linux-omap rebuilt: Merged chip_is removal and voltage branches
authorTony Lindgren <tony@atomide.com>
Thu, 15 Sep 2011 23:16:04 +0000 (16:16 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 15 Sep 2011 23:16:04 +0000 (16:16 -0700)
$ git checkout -b tmp-rebuild-1316128549 linus
$ git merge -m "Merge fixes cleanup voltage board testing-misc testing-board cbus" fixes cleanup voltage board testing-misc testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1316128549

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

Merge branch 'master' into tmp-rebuild-1316128549


Trivial merge