]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'pinmux/next/pfc' of git://linuxtv.org/pinchartl/fbdev into devel
authorLinus Walleij <linus.walleij@linaro.org>
Wed, 11 Dec 2013 10:06:42 +0000 (11:06 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 11 Dec 2013 10:06:42 +0000 (11:06 +0100)

Trivial merge