Linus Torvalds c48c43e422 Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 ... * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (476 commits) vmwgfx: Implement a proper GMR eviction mechanism drm/radeon/kms: fix r6xx/7xx 1D tiling CS checker v2 drm/radeon/kms: properly compute group_size on 6xx/7xx drm/radeon/kms: fix 2D tile height alignment in the r600 CS checker drm/radeon/kms/evergreen: set the clear state to the blit state drm/radeon/kms: don't poll dac load detect. gpu: Add Intel GMA500(Poulsbo) Stub Driver drm/radeon/kms: MC vram map needs to be >= pci aperture size drm/radeon/kms: implement display watermark support for evergreen drm/radeon/kms/evergreen: add some additional safe regs v2 drm/radeon/r600: fix tiling issues in CS checker. drm/i915: Move gpu_write_list to per-ring drm/i915: Invalidate the to-ring, flush the old-ring when updating domains drm/i915/ringbuffer: Write the value passed in to the tail register agp/intel: Restore valid PTE bit for Sandybridge after bdd3072 drm/i915: Fix flushing regression from 9af90d19f drm/i915/sdvo: Remove unused encoding member i915: enable AVI infoframe for intel_hdmi.c [v4] drm/i915: Fix current fb blocking for page flip drm/i915: IS_IRONLAKE is synonymous with gen == 5 ... Fix up conflicts in - drivers/gpu/drm/i915/{i915_gem.c, i915/intel_overlay.c}: due to the new simplified stack-based kmap_atomic() interface - drivers/gpu/drm/vmwgfx/vmwgfx_drv.c: added .llseek entry due to BKL removal cleanups.		2010-10-26 18:57:59 -07:00
..
aty	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-10-25 08:19:14 -07:00
backlight
console	fbcon: fix lockdep warning from fbcon_deinit()	2010-09-22 17:22:39 -07:00
display
geode
i810	i2c: Remove unneeded inclusions of <linux/i2c-id.h>	2010-10-24 18:16:58 +02:00
intelfb	i2c: Remove unneeded inclusions of <linux/i2c-id.h>	2010-10-24 18:16:58 +02:00
kyro
logo
matrox	matroxfb: fix incorrect use of memcpy_toio()	2010-08-20 09:34:54 -07:00
mb862xx	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
mbx	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
msm
nvidia
omap	video/omap: remove mux.h include	2010-10-22 23:21:02 +03:00
omap2	Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux	2010-10-26 10:02:39 -07:00
pnx4008
riva
savage	i2c: Remove unneeded inclusions of <linux/i2c-id.h>	2010-10-24 18:16:58 +02:00
sis	drivers/video/sis/sis_main.c: prevent reading uninitialized stack memory	2010-09-22 17:22:39 -07:00
vermilion
via	drivers/video/via/ioctl.c: prevent reading uninitialized stack memory	2010-09-15 23:43:53 +00:00
68328fb.c
acornfb.c
acornfb.h
amba-clcd.c	VIDEO: amba clcd: don't disable an already disabled clock	2010-08-17 22:15:09 +01:00
amifb.c
arcfb.c	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
arkfb.c
asiliantfb.c
atafb_iplan2p2.c
atafb_iplan2p4.c
atafb_iplan2p8.c
atafb_mfb.c
atafb_utils.h
atafb.c	fbdev: atafb - Remove undead ifdef ATAFB_FALCON	2010-10-22 09:43:25 +02:00
atafb.h
atmel_lcdfb.c
au1100fb.c
au1100fb.h
au1200fb.c	replace nested max/min macros with {max,min}3 macro	2010-10-26 16:52:12 -07:00
au1200fb.h
bf54x-lq043fb.c	fix printk typo 'faild'	2010-08-09 11:25:17 +02:00
bfin-lq035q1-fb.c
bfin-t350mcqb-fb.c	fix printk typo 'faild'	2010-08-09 11:25:17 +02:00
broadsheetfb.c
bt431.h
bt455.h
bw2.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -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/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
cg6.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
cg14.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
chipsfb.c
cirrusfb.c
clps711xfb.c
cobalt_lcdfb.c
controlfb.c
controlfb.h
cyber2000fb.c
cyber2000fb.h
da8xx-fb.c
dnfb.c
edid.h
efifb.c	efifb: support the EFI framebuffer on more Apple hardware	2010-09-22 17:22:39 -07:00
ep93xx-fb.c
epson1355fb.c	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
fb_ddc.c
fb_defio.c
fb_draw.h
fb_notify.c
fb_sys_fops.c
fbcmap.c
fbcvt.c	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
fbmem.c	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
fbmon.c
fbsysfs.c
ffb.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
fm2fb.c
fsl-diu-fb.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
g364fb.c
gbefb.c
gxt4500.c
hecubafb.c
hgafb.c
hitfb.c
hpfb.c
igafb.c	drivers/video/igafb.c: make igafb_setup() and igafb_init() static	2010-08-11 08:59:12 -07:00
imsttfb.c
imxfb.c	ARM: 6281/1: video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE	2010-08-10 22:10:51 +01:00
jz4740_fb.c
Kconfig	Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2010-10-26 18:57:59 -07:00
leo.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
macfb.c
macmodes.c
macmodes.h
Makefile	Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable	2010-08-06 18:13:19 +01:00
maxinefb.c
metronomefb.c	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
modedb.c
mx3fb.c
n411.c
neofb.c
nuc900fb.c
nuc900fb.h
offb.c
output.c
p9100.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
platinumfb.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -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	ARM: pxa168fb: add .remove function	2010-10-09 17:07:23 +08:00
pxa168fb.h
pxafb.c
pxafb.h
q40fb.c	fbdev/m68k: Fix section mismatches in q40fb.c	2010-10-22 09:43:25 +02:00
s1d13xxxfb.c
s3c2410fb.c
s3c2410fb.h
s3c-fb.c	s3c-fb: automatically calculate pixel clock when none is given	2010-08-11 08:59:12 -07:00
s3fb.c
sa1100fb.c
sa1100fb.h
sbuslib.c
sbuslib.h
sgivwfb.c
sh7760fb.c
sh_mipi_dsi.c
sh_mobile_hdmi.c	fbdev: sh_mobile_hdmi: add new label for sound error path	2010-09-10 16:07:41 +01:00
sh_mobile_lcdcfb.c	sh: free-without-alloc fix for sh_mobile_lcdcfb	2010-10-13 19:16:44 +09:00
skeletonfb.c
sm501fb.c
sstfb.c
sticore.h
stifb.c
sunxvr500.c
sunxvr1000.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
sunxvr2500.c
svgalib.c
syscopyarea.c
sysfillrect.c
sysimgblt.c
tcx.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
tdfxfb.c
tgafb.c
tmiofb.c
tridentfb.c
uvesafb.c	param: use ops in struct kernel_param, rather than get and set fns directly	2010-08-11 23:04:13 +09:30
valkyriefb.c
valkyriefb.h
vesafb.c	vesafb: fix comment a typo	2010-08-16 15:14:03 +02:00
vfb.c
vga16fb.c
vgastate.c
vt8623fb.c	param: simple locking for sysfs-writable charp parameters	2010-08-11 23:04:31 +09:30
w100fb.c	drivers/video/w100fb.c: ignore void return value / fix build failure	2010-08-09 20:44:53 -07:00
w100fb.h
xen-fbfront.c
xilinxfb.c	fbdev/xilinxfb: Microblaze driver support	2010-10-21 16:04:51 +10:00