git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
75ec72f
2946294
)
Merge branch 'viafb-pll' into viafb-next
author
Florian Tobias Schandinat
<FlorianSchandinat@gmx.de>
Sun, 24 Apr 2011 13:18:48 +0000
(13:18 +0000)
committer
Florian Tobias Schandinat
<FlorianSchandinat@gmx.de>
Sun, 24 Apr 2011 13:18:48 +0000
(13:18 +0000)
Conflicts:
drivers/video/via/viamode.c
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Trivial merge