Linux-omap rebuilt: Last -rc6 bake with hwmod changes and updated fixes

$ git checkout -b tmp-rebuild-1331256085 linus
$ git merge -m "Merge tmp-merge dt-part2 pm sr ams-delta omap4 driver board testing-board testing-misc cbus" tmp-merge dt-part2 pm sr ams-delta omap4 driver board testing-board testing-misc cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1331256085

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

Merge branch 'master' into tmp-rebuild-1331256085