diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-04-22 22:51:44 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-04-22 22:51:44 +0200 |
| commit | 989b7135666c464d90e296752802b2f37d168588 (patch) | |
| tree | 8c8f4d61dc6d38e8ca89c6c2efc0e0b5e1893c48 /fs/cifs/misc.c | |
| parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) | |
| parent | e0373607855d033283b19014c8f14b90b3836924 (diff) | |
| download | op-kernel-dev-989b7135666c464d90e296752802b2f37d168588.zip op-kernel-dev-989b7135666c464d90e296752802b2f37d168588.tar.gz | |
Merge branch 'spear/pinctrl' into next/pinctrl
This is a rebased version of some contents of
git://git.stlinux.com/spear/linux-2.6.git spear-v3.5
which was accidentally sent against linux-next rather than an
-rc release.
The commits are based on other changes in the spear/dt branch
of the arm-soc tree that they depend on.
* spear/pinctrl:
SPEAr3xx: Add pinctrl support for boards
SPEAr: Remove existing padmux support for SPEAr
pinctrl: Add SPEAr3xx pinctrl drivers
pinctrl: Add SPEAr pinctrl drivers
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/cifs/misc.c')
0 files changed, 0 insertions, 0 deletions
