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)
commitf33f6f0ccc5ff7415da3feb18b1ff966ed2d80d1
tree5074abce8a7cffd69519194c8b5b627de1099dca
parent75ec72f8c53b9f981e68704432a2e425a01f79b7
parent2946294f9aa734efc5873ea2f34131d0a8c0f89a
Merge branch 'viafb-pll' into viafb-next

Conflicts:
drivers/video/via/viamode.c

Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
drivers/video/via/hw.c
drivers/video/via/hw.h
drivers/video/via/lcd.c
drivers/video/via/viamode.c