projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0af14d dcb5dbc)
Merge tag 'pinctrl-mergebase-20120418' into HEAD
authorLinus Walleij <linus.walleij@linaro.org>
Fri, 11 May 2012 07:04:22 +0000 (09:04 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 11 May 2012 07:04:22 +0000 (09:04 +0200)
Conflicts:
drivers/pinctrl/core.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.