Merge branch 'viafb-pll' into viafb-next
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sun, 24 Apr 2011 13:18:48 +0000 (13:18 +0000)
committerFlorian 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