git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
95bddd9
bb1dbe7
)
Merge branch 'fixes-non-critical-part2' into tmp-merge
author
Tony Lindgren
<tony@atomide.com>
Tue, 6 Mar 2012 21:57:55 +0000
(13:57 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 6 Mar 2012 21:57:55 +0000
(13:57 -0800)
Conflicts:
arch/arm/mach-omap2/io.c
Trivial merge