git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
71f2c15
1bf6d2c
)
Merge branch 'stericsson/fixes' into next/cleanup
author
Arnd Bergmann
<arnd@arndb.de>
Sat, 8 Oct 2011 19:47:06 +0000
(21:47 +0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Sat, 8 Oct 2011 19:47:06 +0000
(21:47 +0200)
Conflicts:
arch/arm/mach-ux500/cpu.c
Trivial merge