Linux-omap rebuilt: Merged iommu fixes

$ git checkout -b tmp-rebuild-1309790855 linus
$ git merge -m "Merge omap-fixes-for-linus devel-cleanup devel-fixes devel-board omap-testing cbus" omap-fixes-for-linus devel-cleanup devel-fixes devel-board omap-testing cbus
$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.g for_3.1/i2c-andy
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1309790855

To view the changes since the last rebuild, please do
$ git diff 6506da7554201360287aa3aa6b71b49360335975..89f9ec60a42a66a11be67a671892ed131fa77353 arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1309790855