From: Linus Walleij <linus.walleij@linaro.org>
Date: Fri, 11 May 2012 07:04:22 +0000 (+0200)
Subject: Merge tag 'pinctrl-mergebase-20120418' into HEAD
X-Git-Tag: v3.5-rc1~152^2~3^2~13
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b9e3b72d4a8b3a6c85474455f464e12b4ef1cfc1;p=linux.git

Merge tag 'pinctrl-mergebase-20120418' into HEAD

Conflicts:
	drivers/pinctrl/core.c
---

b9e3b72d4a8b3a6c85474455f464e12b4ef1cfc1