git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
03eea7c
fd9f5ed
)
Merge branch 'next/fixes-non-critical' into next/soc
author
Arnd Bergmann
<arnd@arndb.de>
Sat, 26 Jul 2014 15:54:21 +0000
(17:54 +0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Sat, 26 Jul 2014 15:54:21 +0000
(17:54 +0200)
This resolves a nontrivial conflict against a bug fix
in another branch.
Conflicts:
arch/arm/mach-exynos/pm.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff