Merge branch 'bcm-nsp' of ../linux-pinctrl into devel
authorLinus Walleij <linus.walleij@linaro.org>
Thu, 10 Dec 2015 17:47:54 +0000 (18:47 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 10 Dec 2015 17:47:54 +0000 (18:47 +0100)

Trivial merge