git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7839c28
e5f9dec
)
Merge branch 'imx/cpuidle' into late/dt
author
Arnd Bergmann
<arnd@arndb.de>
Tue, 19 Feb 2013 16:22:34 +0000
(17:22 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Tue, 19 Feb 2013 16:22:34 +0000
(17:22 +0100)
This resolves one non-obvious merge conflict between the imx cpuidle
patches and the imx DT changes for 3.9.
Conflicts:
arch/arm/mach-imx/mach-imx6q.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff