Linux-omap rebuilt: Merged branches from Paul and Kevin and mux changes

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

To view the changes since the last rebuild, please do
$ git diff 04b7dac5b85442b970838188f6338952a98aae84..e0c00cdee1aade144da4d8cb890078d6961a9fea arch/arm/*omap*/