Merge commit 'origin/HEAD' into test-merge
[linux-2.6] / include / video / Kbuild
1 unifdef-y += sisfb.h uvesafb.h
2 unifdef-y += edid.h