Linux-omap rebuilt: omap-fixes merged to mainline

$ git checkout -b tmp-rebuild-1256945522 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 -m "Merge ehci" ehci
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1256945522

To view the changes since the last rebuild, please do
$ git diff 0bbf5337f2f2957775051a3caf60b66d3306c815..403b7944f1fb4ca8d7f2f74bc31a3baf6cfb5bb8 arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1256945522