• Linus Torvalds's avatar
    Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 03a2c4d7
    Linus Torvalds authored
    * '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
    03a2c4d7
Name
Last commit
Last update
..
aty Loading commit data...
backlight Loading commit data...
console Loading commit data...
display Loading commit data...
geode Loading commit data...
i810 Loading commit data...
intelfb Loading commit data...
kyro Loading commit data...
logo Loading commit data...
matrox Loading commit data...
mb862xx Loading commit data...
mbx Loading commit data...
msm Loading commit data...
nvidia Loading commit data...
omap Loading commit data...
omap2 Loading commit data...
pnx4008 Loading commit data...
riva Loading commit data...
savage Loading commit data...
sis Loading commit data...
vermilion Loading commit data...
via Loading commit data...
68328fb.c Loading commit data...
Kconfig Loading commit data...
Makefile Loading commit data...
acornfb.c Loading commit data...
acornfb.h Loading commit data...
amba-clcd.c Loading commit data...
amifb.c Loading commit data...
arcfb.c Loading commit data...
arkfb.c Loading commit data...
asiliantfb.c Loading commit data...
atafb.c Loading commit data...
atafb.h Loading commit data...
atafb_iplan2p2.c Loading commit data...
atafb_iplan2p4.c Loading commit data...
atafb_iplan2p8.c Loading commit data...
atafb_mfb.c Loading commit data...
atafb_utils.h Loading commit data...
atmel_lcdfb.c Loading commit data...
au1100fb.c Loading commit data...
au1100fb.h Loading commit data...
au1200fb.c Loading commit data...
au1200fb.h Loading commit data...
bf54x-lq043fb.c Loading commit data...
bfin-lq035q1-fb.c Loading commit data...
bfin-t350mcqb-fb.c Loading commit data...
broadsheetfb.c Loading commit data...
bt431.h Loading commit data...
bt455.h Loading commit data...
bw2.c Loading commit data...
c2p.h Loading commit data...
c2p_core.h Loading commit data...
c2p_iplan2.c Loading commit data...
c2p_planar.c Loading commit data...
carminefb.c Loading commit data...
carminefb.h Loading commit data...
carminefb_regs.h Loading commit data...
cfbcopyarea.c Loading commit data...
cfbfillrect.c Loading commit data...
cfbimgblt.c Loading commit data...
cg14.c Loading commit data...
cg3.c Loading commit data...
cg6.c Loading commit data...
chipsfb.c Loading commit data...
cirrusfb.c Loading commit data...
clps711xfb.c Loading commit data...
cobalt_lcdfb.c Loading commit data...
controlfb.c Loading commit data...
controlfb.h Loading commit data...
cyber2000fb.c Loading commit data...
cyber2000fb.h Loading commit data...
da8xx-fb.c Loading commit data...
dnfb.c Loading commit data...
edid.h Loading commit data...
efifb.c Loading commit data...
ep93xx-fb.c Loading commit data...
epson1355fb.c Loading commit data...
fb_ddc.c Loading commit data...
fb_defio.c Loading commit data...
fb_draw.h Loading commit data...
fb_notify.c Loading commit data...
fb_sys_fops.c Loading commit data...
fbcmap.c Loading commit data...
fbcvt.c Loading commit data...
fbmem.c Loading commit data...
fbmon.c Loading commit data...
fbsysfs.c Loading commit data...
ffb.c Loading commit data...
fm2fb.c Loading commit data...
fsl-diu-fb.c Loading commit data...
fsl-diu-fb.h Loading commit data...
g364fb.c Loading commit data...
gbefb.c Loading commit data...
gxt4500.c Loading commit data...
hecubafb.c Loading commit data...
hgafb.c Loading commit data...
hitfb.c Loading commit data...
hpfb.c Loading commit data...
igafb.c Loading commit data...
imsttfb.c Loading commit data...
imxfb.c Loading commit data...
leo.c Loading commit data...
macfb.c Loading commit data...
macmodes.c Loading commit data...
macmodes.h Loading commit data...
maxinefb.c Loading commit data...
metronomefb.c Loading commit data...
modedb.c Loading commit data...
mx3fb.c Loading commit data...
n411.c Loading commit data...
neofb.c Loading commit data...
offb.c Loading commit data...
output.c Loading commit data...
p9100.c Loading commit data...
platinumfb.c Loading commit data...
platinumfb.h Loading commit data...
pm2fb.c Loading commit data...
pm3fb.c Loading commit data...
pmag-aa-fb.c Loading commit data...
pmag-ba-fb.c Loading commit data...
pmagb-b-fb.c Loading commit data...
ps3fb.c Loading commit data...
pvr2fb.c Loading commit data...
pxa168fb.c Loading commit data...
pxa168fb.h Loading commit data...
pxafb.c Loading commit data...
pxafb.h Loading commit data...
q40fb.c Loading commit data...
s1d13xxxfb.c Loading commit data...
s3c-fb.c Loading commit data...
s3c2410fb.c Loading commit data...
s3c2410fb.h Loading commit data...
s3fb.c Loading commit data...
sa1100fb.c Loading commit data...
sa1100fb.h Loading commit data...
sbuslib.c Loading commit data...
sbuslib.h Loading commit data...
sgivwfb.c Loading commit data...
sh7760fb.c Loading commit data...
sh_mobile_lcdcfb.c Loading commit data...
skeletonfb.c Loading commit data...
sm501fb.c Loading commit data...
sstfb.c Loading commit data...
sticore.h Loading commit data...
stifb.c Loading commit data...
sunxvr2500.c Loading commit data...
sunxvr500.c Loading commit data...
svgalib.c Loading commit data...
syscopyarea.c Loading commit data...
sysfillrect.c Loading commit data...
sysimgblt.c Loading commit data...
tcx.c Loading commit data...
tdfxfb.c Loading commit data...
tgafb.c Loading commit data...
tmiofb.c Loading commit data...
tridentfb.c Loading commit data...
uvesafb.c Loading commit data...
valkyriefb.c Loading commit data...
valkyriefb.h Loading commit data...
vesafb.c Loading commit data...
vfb.c Loading commit data...
vga16fb.c Loading commit data...
vgastate.c Loading commit data...
vt8623fb.c Loading commit data...
w100fb.c Loading commit data...
w100fb.h Loading commit data...
xen-fbfront.c Loading commit data...
xilinxfb.c Loading commit data...