Linus Torvalds f878133bf0 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: (39 commits) i915/gtt: fix ordering causing DMAR errors on object teardown. i915/gtt: fix ordering issues with status setup and DMAR drm/i915/execbuffer: Reorder binding of objects to favour restrictions drm/i915: If we hit OOM when allocating GTT pages, clear the aperture drm/i915/evict: Ensure we completely cleanup on failure drm/i915/execbuffer: Correctly clear the current object list upon EFAULT drm/i915/debugfs: Show all objects in the gtt drm/i915: Record AGP memory type upon error drm/i915: Periodically flush the active lists and requests drm/i915/gtt: Unmap the PCI pages after unbinding them from the GTT drm/i915: Record the error batchbuffer on each ring drm/i915: Include TLB miss overhead for computing WM drm/i915: Propagate error from flushing the ring drm/i915: detect & report PCH display error interrupts drm/i915: cleanup rc6 code drm/i915: fix rc6 enabling around suspend/resume drm/i915: re-enable rc6 support for Ironlake+ drm/i915: Make the ring IMR handling private drm/i915/ringbuffer: Simplify the ring irq refcounting drm/i915/debugfs: Show the per-ring IMR ...		2011-01-12 08:40:25 -08:00
..
accessibility
acpi	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
amba
ata	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2011-01-10 08:22:33 -08:00
atm	Madge Ambassador ATM Adapter driver: Always release_firmware() in ucode_init() and don't leak memory.	2011-01-09 15:45:48 -08:00
auxdisplay
base	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2011-01-10 16:10:33 -08:00
block	Merge branch 'stable/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-01-12 08:37:35 -08:00
bluetooth
cdrom
char	i915/gtt: fix ordering causing DMAR errors on object teardown.	2011-01-12 11:39:48 +10:00
clk
clocksource
connector
cpufreq
cpuidle	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
crypto
dca
dio
dma	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-01-11 16:31:41 -08:00
edac	Merge branch 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp	2011-01-07 14:54:03 -08:00
eisa
firewire
firmware
gpio	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
gpu	drm/i915/execbuffer: Reorder binding of objects to favour restrictions	2011-01-11 22:55:48 +00:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2011-01-10 08:15:37 -08:00
hwmon	hwmon: Support for Dallas Semiconductor DS620	2011-01-09 09:10:10 -08:00
i2c	i2c: Constify i2c_client where possible	2011-01-10 22:11:23 +01:00
ide
idle
ieee802154
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2011-01-11 16:30:08 -08:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2011-01-10 08:15:37 -08:00
isdn	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
leds	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
lguest
macintosh	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-01-11 16:31:41 -08:00
mca
md
media	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
memstick
message
mfd	mfd: sh_mobile_sdhi: activate SDIO IRQ for tmio_mmc	2011-01-08 23:52:31 -05:00
misc	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2011-01-10 08:57:03 -08:00
mmc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc	2011-01-11 11:01:24 -08:00
mtd	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2011-01-10 08:57:03 -08:00
net	Merge branch 'stable/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-01-12 08:37:35 -08:00
nubus
of	Merge remote branch 'gcl/next' into next	2011-01-11 15:10:08 +11:00
oprofile
parisc
parport
pci	Merge branch 'stable/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-01-12 08:37:35 -08:00
pcmcia	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
platform	sony-laptop: support new hotkeys on the P, Z and EC series	2011-01-10 12:00:22 -05:00
pnp
power
pps
ps3
rapidio
regulator
rtc	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-01-11 16:31:41 -08:00
s390	headers: kobject.h redux	2011-01-10 08:51:44 -08:00
sbus
scsi	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2011-01-10 08:22:33 -08:00
serial	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin	2011-01-10 17:06:08 -08:00
sfi
sh	headers: kobject.h redux	2011-01-10 08:51:44 -08:00
sn
spi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6	2011-01-10 08:14:53 -08:00
ssb
staging	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-01-10 16:04:53 -08:00
tc
telephony
thermal
tty	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-01-07 14:39:20 -08:00
uio
usb	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-01-10 16:04:53 -08:00
uwb
vhost
video	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-01-10 16:04:53 -08:00
virtio
vlynq
w1
watchdog	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-01-11 11:02:13 -08:00
xen	Merge branch 'stable/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-01-12 08:37:35 -08:00
zorro
Kconfig
Makefile	Merge branch 'smp' into misc	2011-01-06 22:32:03 +00:00