Linux-omap rebuilt: omap-for-linus updated, pm-hwmods merged for testing

$ git checkout -b tmp-rebuild-1286394925 linus
$ git merge -m "Merge cbus" cbus
$ 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 pull ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git pm-hwmod-i2c
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1286394925

To view the changes since the last rebuild, please do
$ git diff d1f5295de78f2d327d60eb1d070da4c8c37fe457..c1c3b118f134acc87578516fa9551ce05510c44c arch/arm/*omap*/