Russell King b3773301c4 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable ... Conflicts: drivers/video/sh_mobile_hdmi.c		2010-10-28 20:14:38 +01:00
..
atmel_lcdc.h
aty128.h
broadsheetfb.h
cirrus.h
cvisionppc.h
da8xx-fb.h
edid.h
epson1355.h
gbe.h
hecubafb.h
iga.h
ili9320.h
Kbuild	include: replace unifdef-y with header-y	2010-08-14 22:26:51 +02:00
kyro.h
mach64.h
maxinefb.h
mbxfb.h
metronomefb.h
mipi_display.h
neomagic.h
newport.h
permedia2.h
platform_lcd.h
pm3fb.h
pmag-ba-fb.h
pmagb-b-fb.h
pxa168fb.h
radeon.h
s1d13xxxfb.h
sgivw.h
sh_mipi_dsi.h
sh_mobile_hdmi.h	fbdev: sh_mobile_hdmi: modify flags name to more specific	2010-09-10 16:07:41 +01:00
sh_mobile_lcdc.h	fbdev: sh_mobile_hdmi: implement locking	2010-09-14 17:23:21 +09:00
sisfb.h
sstfb.h
tdfx.h
tgafb.h
trident.h
uvesafb.h
vga.h	include/video/vga.h: update web address.	2010-08-16 15:15:18 +02:00
w100fb.h