diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 17:43:35 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 17:43:59 +0200 |
| commit | fcd8d84a585f3578a9ebdd27e757495a27415322 (patch) | |
| tree | 58f37676ad56d322e47d0fa7343afb85445f7649 /drivers/pinctrl/pinctrl-pxa3xx.c | |
| parent | Merge branch 'spear/clock' into next/clock (diff) | |
| parent | Merge branch 'spear/dt' into spear/clock (diff) | |
| parent | Merge branch 'imx/pinctrl' into imx/clock (diff) | |
| download | linux-fcd8d84a585f3578a9ebdd27e757495a27415322.tar.xz linux-fcd8d84a585f3578a9ebdd27e757495a27415322.zip | |
Merge branches 'spear/clock' and 'imx/clock' into next/clock
Updated to resolve dependencies.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>