Merge branch 'devel-dt-free-map' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Thu, 23 Jun 2016 09:19:14 +0000 (11:19 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 23 Jun 2016 09:19:14 +0000 (11:19 +0200)
1  2 
drivers/pinctrl/pinconf-generic.c

Simple merge