projects / platform / kernel / linux-stable.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e037360 c7eea50 e9d7f40)
Merge branches 'depends/pinctrl/devel' and 'depends/rmk/clkdev' into spear/pinctrl
authorArnd Bergmann <arnd@arndb.de>
Sat, 12 May 2012 18:38:42 +0000 (20:38 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 12 May 2012 18:38:42 +0000 (20:38 +0200)
commit366695ff706669d40459174b1cbb78fca42f4e06
tree085d0d288138c5a0bfb203643e99885ff07ddad7tree | snapshot
parente0373607855d033283b19014c8f14b90b3836924commit | diff
parentc7eea50b980b28f4edaa0cfbdf2456532472bc03commit | diff
parente9d7f4065408e92338a41b809e437c6e043da090commit | diff
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>
Documentation/driver-model/devres.txt diff1 | diff2 | diff3 | blob | history
drivers/pinctrl/Kconfig diff1 | diff2 | diff3 | blob | history
drivers/pinctrl/Makefile diff1 | diff2 | diff3 | blob | history
Domain: System / Kernel;