git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3e900a3
69758ab
)
Merge branch 'pm-hwmods' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman...
author
Tony Lindgren
<tony@atomide.com>
Tue, 5 Oct 2010 17:00:40 +0000
(10:00 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 5 Oct 2010 17:00:40 +0000
(10:00 -0700)
Conflicts:
arch/arm/mach-omap2/serial.c
arch/arm/plat-omap/common.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff