Merge branch 'v3.10/topic/pinctrl' into linux-linaro-lsk
authorAlex Shi <alex.shi@linaro.org>
Mon, 16 Jun 2014 04:06:26 +0000 (12:06 +0800)
committerAlex Shi <alex.shi@linaro.org>
Mon, 16 Jun 2014 04:06:26 +0000 (12:06 +0800)

Trivial merge