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: Arnd Bergmann <arnd@arndb.de>
Showing
drivers/pinctrl/devicetree.c
0 → 100644
drivers/pinctrl/devicetree.h
0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
Please register or sign in to comment