Eric Anholt 34dc4d4423 Merge remote branch 'origin/master' into drm-intel-next ... Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/radeon/r300.c The BSD ringbuffer support that is landing in this branch significantly conflicts with the Ironlake PIPE_CONTROL fix on master, and requires it to be tested successfully anyway.		2010-05-10 13:36:52 -07:00
..
boot	Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-02-28 10:43:53 -08:00
configs
crypto	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ia32	x86: correctly wire up the newuname system call	2010-04-20 09:17:21 -07:00
include/asm	Merge remote branch 'origin/master' into drm-intel-next	2010-05-10 13:36:52 -07:00
kernel	powernow-k8: Fix frequency reporting	2010-05-03 15:04:18 +02:00
kvm	KVM: x86: Fix TSS size check for 16-bit tasks	2010-04-21 13:51:42 +03:00
lguest	lguest: stop using KVM hypercall mechanism	2010-04-14 21:43:56 +09:30
lib	Fix the x86_64 implementation of call_rwsem_wait()	2010-05-04 15:24:14 -07:00
math-emu
mm	Merge remote branch 'origin/master' into drm-intel-next	2010-05-10 13:36:52 -07:00
oprofile	perf, x86: rename macro in ARCH_PERFMON_EVENTSEL_ENABLE	2010-03-01 14:21:23 +01:00
pci	x86/PCI: compute Address Space length rather than using _LEN	2010-04-28 09:17:45 -07:00
power	Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip	2010-04-07 11:02:23 -07:00
tools	x86: Remove trailing spaces in messages	2010-02-07 17:47:51 +01:00
vdso	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
video
xen	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
Kbuild
Kconfig	x86: Increase CONFIG_NODES_SHIFT max to 10	2010-04-02 19:09:31 +02:00
Kconfig.cpu	Merge branch 'x86-rwsem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-02-28 10:41:35 -08:00
Kconfig.debug	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-12-11 20:47:30 -08:00
Makefile	x86-64: Allow fbdev primary video code	2010-02-16 21:22:26 -08:00
Makefile_32.cpu	Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-12-08 13:38:11 -08:00