Linux-omap rebuilt: Updated to -rc7, iommu fix
authorTony Lindgren <tony@atomide.com>
Wed, 11 May 2011 17:49:41 +0000 (10:49 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 11 May 2011 17:49:41 +0000 (10:49 -0700)
$ git checkout -b tmp-rebuild-1305136164 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-1305136164

To view the changes since the last rebuild, please do
$ git diff 46966f1634846e6d5413f62c28453371e56eac78..5330dfa6ce1bbce7889fe4cf70c1448590039a7a arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1305136164


Trivial merge