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

..

kmemcheck

kmemcheck: Test the full object in kmemcheck_is_obj_initialized()

2010-02-17 21:39:08 +02:00

dump_pagetables.c

x86: remove (null) in /sys kernel_page_tables

2009-04-14 11:50:22 +02:00

extable.c

x86, 64-bit: Move K8 B step iret fixup to fault entry asm

2009-10-12 18:29:46 +02:00

fault.c

Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-12-05 15:33:27 -08:00

gup.c

x86, doc: Fix minor spelling error in arch/x86/mm/gup.c

2010-02-02 16:00:44 -08:00

highmem_32.c

Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2009-09-14 17:43:43 -07:00

hugetlbpage.c

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

init_32.c

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

init_64.c

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

init.c

Merge branch 'master' into export-slabh

2010-04-05 11:37:28 +09:00

iomap_32.c

x86, pat: Add PAT reserve free to io_mapping* APIs

2009-08-26 15:41:16 -07:00

ioremap.c

x86: Fix 'reservetop=' functionality

2010-04-30 12:19:53 +02:00

k8topology_64.c

x86: Move find_smp_config() earlier and avoid bootmem usage

2009-11-24 12:10:51 +01:00

kmmio.c

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

Makefile

x86: split NX setup into separate file to limit unstack-protected code

2009-09-21 13:56:58 -07:00

memtest.c

x86: memtest: use pointers of equal type for comparison

2009-06-11 16:26:35 +02:00

mmap.c

x86: Use helpers for rlimits

2010-01-27 15:17:31 -08:00

mmio-mod.c

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

numa_32.c

x86: Make 32bit support NO_BOOTMEM

2010-02-12 09:42:39 -08:00

numa_64.c

Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-03-03 08:15:05 -08:00

numa.c

cpumask: convert node_to_cpumask_map[] to cpumask_var_t

2009-03-13 14:35:31 +01:00

pageattr-test.c

x86: make sure the CPA test code's use of _PAGE_UNUSED1 is obvious

2008-09-05 17:09:57 +02:00

pageattr.c

Merge branch 'drm-ttm-pool' into drm-core-next

2010-04-20 13:12:28 +10:00

pat.c

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

pf_in.c

x86: fix mmiotrace 8-bit register decoding

2008-10-14 10:33:50 +02:00

pf_in.h

x86 mmiotrace: move files into arch/x86/mm/.

2008-05-24 11:25:37 +02:00

pgtable_32.c

x86: Fix parse_reservetop() build failure on certain configs

2010-05-03 09:22:19 +02:00

pgtable.c

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

physaddr.c

x86: split __phys_addr out into separate file

2009-09-10 11:48:55 -07:00

physaddr.h

x86: split __phys_addr out into separate file

2009-09-10 11:48:55 -07:00

setup_nx.c

x86, mm: Report state of NX protections during boot

2009-11-16 13:44:59 -08:00

srat_32.c

x86: Fix checking of SRAT when node 0 ram is not from 0

2009-12-16 16:43:37 -08:00

srat_64.c

x86: Set hotpluggable nodes in nodes_possible_map

2010-01-23 06:21:57 +01:00

testmmiotrace.c

testmmiotrace.c: Add and use pr_fmt(fmt)

2009-10-12 08:05:41 +02:00

tlb.c

x86: Convert tlbstate_lock to raw_spinlock

2010-02-17 18:28:59 +01:00