From: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Date: Sun, 24 Apr 2011 13:18:48 +0000 (+0000)
Subject: Merge branch 'viafb-pll' into viafb-next
X-Git-Tag: v3.0-rc1~364^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f33f6f0ccc5ff7415da3feb18b1ff966ed2d80d1;p=pandora-kernel.git

Merge branch 'viafb-pll' into viafb-next

Conflicts:
	drivers/video/via/viamode.c

Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
---

f33f6f0ccc5ff7415da3feb18b1ff966ed2d80d1
Reading git-diff-tree failed