366695ff70
The spear/pinctrl branch has hard dependencies on both the pinctrl branch and the clkdev branch. We merge those here to fix it up without having to rebase a branch that has been pulled into other stable branches already. Conflicts: Documentation/driver-model/devres.txt Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
|---|---|---|
| .. | ||
| fsl,imx-pinctrl.txt | ||
| fsl,imx6q-pinctrl.txt | ||
| fsl,mxs-pinctrl.txt | ||
| nvidia,tegra20-pinmux.txt | ||
| nvidia,tegra30-pinmux.txt | ||
| pinctrl-bindings.txt | ||
| pinctrl_spear.txt | ||