Linux-omap rebuilt: rebuilt one more time with updated hwmod branches from paul

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

To view the changes since the last rebuild, please do
$ git diff be3759a0482cfa63a921be4e0f321d249f750959..27c5b5b5a5755ffea0dd7d1f4b1abeef1c3ef4f9 arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1331325486