git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
aca6ad0
790ab7e
)
Merge branch 'devel-cleanup' into omap-for-linus
author
Tony Lindgren
<tony@atomide.com>
Thu, 3 Mar 2011 01:07:14 +0000
(17:07 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 3 Mar 2011 01:07:14 +0000
(17:07 -0800)
Conflicts:
arch/arm/mach-omap2/timer-gp.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff