git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3b0d597
5f0a6e2
)
Merge branch 'v3.2-rc7' into next/pm
author
Arnd Bergmann
<arnd@arndb.de>
Tue, 3 Jan 2012 20:27:45 +0000
(20:27 +0000)
committer
Arnd Bergmann
<arnd@arndb.de>
Tue, 3 Jan 2012 20:27:45 +0000
(20:27 +0000)
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff