Merge branch 'pinmux/next' of git://linuxtv.org/pinchartl/fbdev into devel