git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9ad2a24
4b8b5f2
)
Merge branch 'cleanup/kconfig' into next/drivers
author
Arnd Bergmann
<arnd@arndb.de>
Tue, 18 Mar 2014 15:25:47 +0000
(16:25 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Tue, 18 Mar 2014 15:25:47 +0000
(16:25 +0100)
This resolves a conflict between the new sti reset
controller driver and the Kconfig cleanup.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff