diff options
author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-04-24 09:18:48 -0400 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-04-24 09:18:48 -0400 |
commit | f33f6f0ccc5ff7415da3feb18b1ff966ed2d80d1 (patch) | |
tree | 5074abce8a7cffd69519194c8b5b627de1099dca /drivers/video/via/chip.h | |
parent | 75ec72f8c53b9f981e68704432a2e425a01f79b7 (diff) | |
parent | 2946294f9aa734efc5873ea2f34131d0a8c0f89a (diff) |
Merge branch 'viafb-pll' into viafb-next
Conflicts:
drivers/video/via/viamode.c
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video/via/chip.h')
0 files changed, 0 insertions, 0 deletions