Merge branches 'devel-mux' and 'devel-misc' into omap-for-linus