linux/drivers/video
Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2010-05-22 00:36:56 -06:00
..
aty sysfs: add struct file* to bin_attr callbacks 2010-05-21 09:37:31 -07:00
backlight
console
display
geode
i810
intelfb
kyro
logo
matrox
mb862xx of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
mbx
msm
nvidia
omap
omap2 OMAP: DSS2: Fix omap_dss_probe() error path 2010-05-18 15:06:09 +03:00
pnx4008
riva
savage
sis
vermilion
via Merge branch 'viafb-next' of git://git.lwn.net/linux-2.6 2010-05-20 13:34:17 -07:00
68328fb.c
acornfb.c
acornfb.h
amba-clcd.c
amifb.c m68k: amiga - Frame buffer platform device conversion 2010-05-17 21:37:43 +02:00
arcfb.c
arkfb.c
asiliantfb.c
atafb_iplan2p2.c
atafb_iplan2p4.c
atafb_iplan2p8.c
atafb_mfb.c
atafb_utils.h
atafb.c
atafb.h
atmel_lcdfb.c
au1100fb.c
au1100fb.h
au1200fb.c
au1200fb.h
bf54x-lq043fb.c
bfin-lq035q1-fb.c
bfin-t350mcqb-fb.c fbdev: bfin-t350mcqb-fb: fix fbmem allocation with blanking lines 2010-05-11 17:33:42 -07:00
broadsheetfb.c
bt431.h
bt455.h
bw2.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
c2p_core.h
c2p_iplan2.c
c2p_planar.c
c2p.h
carminefb_regs.h
carminefb.c
carminefb.h
cfbcopyarea.c
cfbfillrect.c
cfbimgblt.c
cg3.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
cg6.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
cg14.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
chipsfb.c
cirrusfb.c m68k: amiga - Zorro bus modalias support 2010-05-17 21:37:41 +02:00
clps711xfb.c
cobalt_lcdfb.c
controlfb.c
controlfb.h
cyber2000fb.c
cyber2000fb.h
da8xx-fb.c
dnfb.c
edid.h
efifb.c Merge remote branch 'anholt/drm-intel-next' into drm-next 2010-05-19 09:35:51 +10:00
ep93xx-fb.c
epson1355fb.c
fb_ddc.c
fb_defio.c
fb_draw.h
fb_notify.c
fb_sys_fops.c
fbcmap.c
fbcvt.c
fbmem.c fbmem: avoid printk format warning with 32-bit resources 2010-05-21 20:30:33 -07:00
fbmon.c
fbsysfs.c fbdev: allow passing more than one aperture for handoff 2010-05-18 16:19:27 +10:00
ffb.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
fm2fb.c m68k: amiga - Zorro bus modalias support 2010-05-17 21:37:41 +02:00
fsl-diu-fb.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
fsl-diu-fb.h
g364fb.c
gbefb.c
gxt4500.c
hecubafb.c
hgafb.c
hitfb.c
hpfb.c
igafb.c
imsttfb.c
imxfb.c
Kconfig Merge branch 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm 2010-05-21 14:40:30 -07:00
leo.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
macfb.c
macmodes.c
macmodes.h
Makefile
maxinefb.c
metronomefb.c
modedb.c
mx3fb.c DMAENGINE: extend the control command to include an arg 2010-05-17 16:30:42 -07:00
n411.c
neofb.c
nuc900fb.c
nuc900fb.h
offb.c fbdev: allow passing more than one aperture for handoff 2010-05-18 16:19:27 +10:00
output.c
p9100.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
platinumfb.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
platinumfb.h
pm2fb.c
pm3fb.c
pmag-aa-fb.c
pmag-ba-fb.c
pmagb-b-fb.c
ps3fb.c
pvr2fb.c
pxa168fb.c
pxa168fb.h
pxafb.c
pxafb.h
q40fb.c
s1d13xxxfb.c
s3c2410fb.c
s3c2410fb.h
s3c-fb.c
s3fb.c
sa1100fb.c
sa1100fb.h
sbuslib.c
sbuslib.h
sgivwfb.c
sh7760fb.c
sh_mobile_lcdcfb.c
skeletonfb.c
sm501fb.c
sstfb.c
sticore.h
stifb.c
sunxvr500.c
sunxvr1000.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
sunxvr2500.c
svgalib.c
syscopyarea.c
sysfillrect.c
sysimgblt.c
tcx.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
tdfxfb.c
tgafb.c
tmiofb.c
tridentfb.c
uvesafb.c
valkyriefb.c
valkyriefb.h
vesafb.c fbdev: allow passing more than one aperture for handoff 2010-05-18 16:19:27 +10:00
vfb.c
vga16fb.c vga16fb, drm: vga16fb->drm handoff 2010-05-18 16:19:30 +10:00
vgastate.c
vt8623fb.c
w100fb.c
w100fb.h
xen-fbfront.c
xilinxfb.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00