Merge branches 'depends/pinctrl/devel' and 'depends/rmk/clkdev' into spear/pinctrl
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: NArnd Bergmann <arnd@arndb.de>
Showing
此差异已折叠。
此差异已折叠。
drivers/pinctrl/devicetree.c
0 → 100644
drivers/pinctrl/devicetree.h
0 → 100644
drivers/pinctrl/pinctrl-imx.c
0 → 100644
此差异已折叠。
drivers/pinctrl/pinctrl-imx.h
0 → 100644
drivers/pinctrl/pinctrl-imx23.c
0 → 100644
drivers/pinctrl/pinctrl-imx28.c
0 → 100644
此差异已折叠。
drivers/pinctrl/pinctrl-imx6q.c
0 → 100644
此差异已折叠。
drivers/pinctrl/pinctrl-mxs.c
0 → 100644
此差异已折叠。
drivers/pinctrl/pinctrl-mxs.h
0 → 100644
此差异已折叠。
此差异已折叠。
想要评论请 注册 或 登录