git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
973b659
192cfd5
)
Merge commit 'v3.3-rc6'
author
Tomi Valkeinen
<tomi.valkeinen@ti.com>
Tue, 6 Mar 2012 11:20:31 +0000
(13:20 +0200)
committer
Tomi Valkeinen
<tomi.valkeinen@ti.com>
Tue, 6 Mar 2012 11:20:31 +0000
(13:20 +0200)
Merge v3.3-rc6 to get the latest DSS and OMAP arch fixes.
Conflicts:
arch/arm/mach-omap1/board-innovator.c
drivers/video/omap2/dss/apply.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff