Merge branch 'pinmux/next' of git://linuxtv.org/pinchartl/fbdev into devel
authorLinus Walleij <linus.walleij@linaro.org>
Fri, 27 Sep 2013 13:58:56 +0000 (15:58 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 27 Sep 2013 13:58:56 +0000 (15:58 +0200)

Trivial merge