aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-28 14:08:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-28 14:08:38 -0700
commit06f01e73ef1064d81b010e84941b01a15e2745ed (patch)
tree0e528b67016e187a22027f329852e14867e65dee /arch
parentMerge branch 'lguest' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff)
parentvgaarb: Wrap vga_(get|put) in CONFIG_VGA_ARB (diff)
downloadlinux-dev-06f01e73ef1064d81b010e84941b01a15e2745ed.tar.xz
linux-dev-06f01e73ef1064d81b010e84941b01a15e2745ed.zip
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: vgaarb: Wrap vga_(get|put) in CONFIG_VGA_ARB drm/radeon/kms: add missing scratch update in dp_detect drm/modes: Fix CVT-R modeline generation drm: fix regression in drm locking since BKL removal. drm/radeon/kms: remove stray radeon_i2c_destroy drm: mm: fix range restricted allocations drm/nouveau: drop drm_global_mutex before sleeping in submission path drm: export drm_global_mutex for drivers to use drm/nv20: Don't use pushbuf calls on the original nv20. drm/nouveau: Fix TMDS on some DCB1.5 boards. drm/nouveau: Fix backlight control on PPC machines with an internal TMDS panel. drm/nv30: Apply modesetting to the correct slave encoder drm/nouveau: Use a helper function to match PCI device/subsystem IDs. drm/nv50: add dcb type 14 to enum to prevent compiler complaint
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions