git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
46cddc0
3e6ece1
)
Merge branch 'omap-for-v3.8/cleanup-headers-dss' into omap-for-v3.8/cleanup-headers
author
Tony Lindgren
<tony@atomide.com>
Wed, 17 Oct 2012 18:21:34 +0000
(11:21 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 17 Oct 2012 18:21:34 +0000
(11:21 -0700)
Conflicts:
arch/arm/mach-omap2/board-omap3logic.c
arch/arm/mach-omap2/gpmc.c
drivers/media/platform/omap/omap_vout.c
drivers/media/platform/omap/omap_vout_vrfb.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff