Linus Torvalds 03a2c4d76c Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 ... * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (151 commits) vga_switcheroo: disable default y by new rules. drm/nouveau: fix *staging* driver build with switcheroo off. drm/radeon: fix typo in Makefile vga_switcheroo: fix build on platforms with no ACPI drm/radeon: Fix printf type warning in 64bit system. drm/radeon/kms: bump the KMS version number for square tiling support. vga_switcheroo: initial implementation (v15) drm/radeon/kms: do not disable audio engine twice Revert "drm/radeon/kms: disable HDMI audio for now on rv710/rv730" drm/radeon/kms: do not preset audio stuff and start timer when not using audio drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond drm/ttm: fix function prototype to match implementation drm/radeon: use ALIGN instead of open coding it drm/radeon/kms: initialize set_surface_reg reg for rs600 asic drm/i915: Use a dmi quirk to skip a broken SDVO TV output. drm/i915: enable/disable LVDS port at DPMS time drm/i915: check for multiple write domains in pin_and_relocate drm/i915: clean-up i915_gem_flush_gpu_write_domain drm/i915: reuse i915_gpu_idle helper drm/i915: ensure lru ordering of fence_list ... Fixed trivial conflicts in drivers/gpu/vga/Kconfig		2010-03-04 07:49:37 -08:00
..
aty	of: add 'of_' prefix to machine_is_compatible()	2010-02-09 08:33:00 -07:00
backlight	omap1: Fix compile for omap1_bl.c	2010-01-08 10:29:06 -08:00
console	vga_switcheroo: initial implementation (v15)	2010-03-01 16:20:37 +10:00
display	tree-wide: convert open calls to remove spaces to skip_spaces() lib function	2009-12-15 08:53:32 -08:00
geode	lxfb: add copyright/license info	2009-12-16 07:20:02 -08:00
i810	i810fb: fix stack exploding	2009-12-16 07:20:02 -08:00
intelfb	intelfb: fix setting of active pipe with LVDS displays	2009-12-16 07:20:05 -08:00
kyro
logo
matrox	matroxfb: fix problems with display stability	2009-12-16 07:20:05 -08:00
mb862xx	mb862xxfb: add acceleration support for Coral-P/Coral-PA. * imageblt * copyarea * fillrect	2009-12-16 07:20:01 -08:00
mbx
msm	drivers/video/msm: update to new kernel	2009-11-12 07:26:00 -08:00
nvidia
omap	omapfb: lcd_ams_delta: add support for contrast control	2010-02-12 12:46:07 +02:00
omap2	OMAP: DSS2: Taal: Fix TE when resuming	2010-03-02 17:24:18 +02:00
pnx4008
riva
savage	savagefb: fix blanking mode on CRT display	2009-11-12 07:25:56 -08:00
sis	fbdev: TV_PALN bit set twice in sisfb_detect_VB_connect()	2009-12-16 07:20:01 -08:00
vermilion
via	viafb: fix acceleration for some chips	2010-01-16 12:15:37 -08:00
68328fb.c
acornfb.c
acornfb.h
amba-clcd.c
amifb.c
arcfb.c
arkfb.c
asiliantfb.c
atafb.c	Revert "fbdev: atafb - add palette register check"	2009-12-17 07:20:30 -08:00
atafb.h
atafb_iplan2p2.c
atafb_iplan2p4.c
atafb_iplan2p8.c
atafb_mfb.c
atafb_utils.h
atmel_lcdfb.c	Merge branch 'for-next' into for-linus	2009-12-07 18:36:35 +01:00
au1100fb.c	drivers/video: add kmalloc NULL tests	2009-09-23 07:39:56 -07:00
au1100fb.h
au1200fb.c
au1200fb.h
bf54x-lq043fb.c
bfin-lq035q1-fb.c	fbdev: bfin-lq035q1-fb: new Blackfin Landscape LCD EZ-Extender driver	2009-12-16 07:20:01 -08:00
bfin-t350mcqb-fb.c	fbdev: bfin-t350mcqb-fb: fix LCD dimensions	2009-12-16 07:20:01 -08:00
broadsheetfb.c	fb-defio: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers.	2009-12-03 17:30:42 -08:00
bt431.h
bt455.h
bw2.c
c2p.h
c2p_core.h
c2p_iplan2.c
c2p_planar.c
carminefb.c
carminefb.h
carminefb_regs.h
cfbcopyarea.c	trivial: remove unnecessary semicolons	2009-09-21 15:14:58 +02:00
cfbfillrect.c
cfbimgblt.c
cg3.c
cg6.c
cg14.c
chipsfb.c
cirrusfb.c
clps711xfb.c	clps711xfb: convert to proc_fops	2009-12-16 07:20:04 -08:00
cobalt_lcdfb.c
controlfb.c
controlfb.h
cyber2000fb.c	VIDEO: cyberpro: pci_request_regions needs a persistent name	2009-12-24 18:34:09 +00:00
cyber2000fb.h
da8xx-fb.c	davinci: fb: add framebuffer blank operation	2009-12-16 07:20:05 -08:00
dnfb.c
edid.h
efifb.c	efifb: fix framebuffer handoff	2010-02-22 19:50:34 -08:00
ep93xx-fb.c	fbdev: add palette register check to several drivers	2009-12-16 07:20:01 -08:00
epson1355fb.c
fb_ddc.c
fb_defio.c	Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen	2009-12-10 09:34:40 -08:00
fb_draw.h
fb_notify.c
fb_sys_fops.c
fbcmap.c
fbcvt.c
fbmem.c	fb: for framebuffer handover don't exit the loop early.	2010-02-25 14:15:12 +10:00
fbmon.c
fbsysfs.c
ffb.c
fm2fb.c
fsl-diu-fb.c	powerpc/mpc5121: correct DIU compatible property	2010-02-17 07:33:22 -07:00
fsl-diu-fb.h
g364fb.c
gbefb.c	Merge branch 'for-next' into for-linus	2009-12-07 18:36:35 +01:00
gxt4500.c
hecubafb.c	fb-defio: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers.	2009-12-03 17:30:42 -08:00
hgafb.c
hitfb.c	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
hpfb.c
igafb.c
imsttfb.c
imxfb.c	imxfb: correct location of callbacks in suspend and resume	2010-02-02 18:11:22 -08:00
Kconfig	fbdev: bfin-lq035q1-fb: new Blackfin Landscape LCD EZ-Extender driver	2009-12-16 07:20:01 -08:00
leo.c
macfb.c	macfb: fix 24-bit visual and stuff	2010-02-27 18:31:16 +01:00
macmodes.c	fbdev: add some missing mac modes	2010-02-27 18:31:14 +01:00
macmodes.h
Makefile	fbdev: bfin-lq035q1-fb: new Blackfin Landscape LCD EZ-Extender driver	2009-12-16 07:20:01 -08:00
maxinefb.c	fbdev: add palette register check to several drivers	2009-12-16 07:20:01 -08:00
metronomefb.c	fb-defio: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers.	2009-12-03 17:30:42 -08:00
modedb.c	fbdev: drop custom atoi from drivers/video/modedb.c	2009-12-16 07:20:01 -08:00
mx3fb.c	mx3fb: some debug and initialisation fixes	2010-02-02 18:11:21 -08:00
n411.c
neofb.c
offb.c	offb: Add support for framebuffer handoff to offb.	2009-12-09 17:09:29 +11:00
output.c	tree-wide: convert open calls to remove spaces to skip_spaces() lib function	2009-12-15 08:53:32 -08:00
p9100.c
platinumfb.c	platinumfb: fix misplaced parenthesis	2009-09-23 07:39:50 -07:00
platinumfb.h
pm2fb.c
pm3fb.c
pmag-aa-fb.c
pmag-ba-fb.c	fbdev: add palette register check to several drivers	2009-12-16 07:20:01 -08:00
pmagb-b-fb.c	fbdev: add palette register check to several drivers	2009-12-16 07:20:01 -08:00
ps3fb.c
pvr2fb.c	sh: Fix up more 64-bit pgprot truncation on SH-X2 TLB.	2010-02-17 13:23:00 +09:00
pxa168fb.c	pxa168fb: fix offset setting at initialization	2009-12-01 09:02:31 +08:00
pxa168fb.h
pxafb.c	[ARM] pxafb: fix building issue of incorrect reference	2009-12-29 14:11:27 +08:00
pxafb.h
q40fb.c
s1d13xxxfb.c
s3c-fb.c	revert "drivers/video/s3c-fb.c: fix clock setting for Samsung SoC Framebuffer"	2010-01-16 12:15:40 -08:00
s3c2410fb.c	s3c2410fb: fix clockrate calculation	2009-09-23 07:39:56 -07:00
s3c2410fb.h
s3fb.c
sa1100fb.c	Nicolas Pitre has a new email address	2009-09-15 09:37:12 -07:00
sa1100fb.h
sbuslib.c
sbuslib.h
sgivwfb.c	sgivwfb: Make use of ARRAY_SIZE.	2009-12-04 15:39:52 +01:00
sh7760fb.c
sh_mobile_lcdcfb.c	video: sh_mobile_lcdcfb: Fix panning.	2010-02-16 13:30:29 +09:00
skeletonfb.c
sm501fb.c	sm501: implement acceleration features	2009-12-16 07:20:04 -08:00
sstfb.c
sticore.h
stifb.c	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
sunxvr500.c	sunxvr500: Additional PCI id for sunxvr500 driver	2010-02-26 04:37:09 -08:00
sunxvr2500.c
svgalib.c
syscopyarea.c
sysfillrect.c
sysimgblt.c
tcx.c
tdfxfb.c	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
tgafb.c
tmiofb.c	drivers/video/tmiofb.c: fix uninitialised return value	2009-09-23 07:39:57 -07:00
tridentfb.c
uvesafb.c	fb: remove fb_save_state() and fb_restore_state operations	2009-11-12 07:25:56 -08:00
valkyriefb.c	valkyriefb: various fixes	2010-02-27 18:31:13 +01:00
valkyriefb.h	valkyriefb: various fixes	2010-02-27 18:31:13 +01:00
vesafb.c
vfb.c
vga16fb.c
vgastate.c
vt8623fb.c	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
w100fb.c
w100fb.h
xen-fbfront.c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-12-11 12:18:16 -08:00
xilinxfb.c