Linux-omap rebuilt: pm fixes from kevin merged

$ git checkout -b tmp-rebuild-1264040700 linus
$ git merge -m "Merge omap-fixes" omap-fixes
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge for-next" for-next
$ git merge -m "Merge cbus" cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1264040700

To view the changes since the last rebuild, please do
$ git diff 91b999eef63ae0d94ef6d1eb99d93284a2b3e48b..69b2ad517f2e87c463ecd5bc599c6abe75a3b83a arch/arm/*omap*/