Jens Axboe 4c63f5646e Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core ...

Conflicts:
	block/blk-core.c
	block/blk-flush.c
	drivers/md/raid1.c
	drivers/md/raid10.c
	drivers/md/raid5.c
	fs/nilfs2/btnode.c
	fs/nilfs2/mdt.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

2011-03-10 08:58:35 +01:00

..

backing-dev.c

block: remove per-queue plugging

2011-03-10 08:52:07 +01:00

bootmem.c

…

bounce.c

…

compaction.c

mm: compaction: prevent division-by-zero during user-requested compaction

2011-01-20 17:02:05 -08:00

debug-pagealloc.c

…

dmapool.c

mm/dmapool.c: use TASK_UNINTERRUPTIBLE in dma_pool_alloc()

2011-01-13 17:32:48 -08:00

fadvise.c

…

failslab.c

…

filemap_xip.c

…

filemap.c

fs: make generic file read/write functions plug

2011-03-10 08:52:26 +01:00

fremap.c

…

highmem.c

mm,x86: fix kmap_atomic_push vs ioremap_32.c

2010-10-27 18:03:05 -07:00

huge_memory.c

thp: prevent hugepages during args/env copying into the user stack

2011-02-15 15:21:11 -08:00

hugetlb.c

hugetlb: fix handling of parse errors in sysfs

2011-01-13 17:32:49 -08:00

hwpoison-inject.c

…

init-mm.c

…

internal.h

Revert "mm: batch activate_page() to reduce lock contention"

2011-01-17 14:42:19 -08:00

Kconfig

mm: compaction: don't depend on HUGETLB_PAGE

2011-01-26 10:50:02 +10:00

Kconfig.debug

…

kmemcheck.c

…

kmemleak-test.c

kmemleak: remove memset by using kzalloc

2011-01-27 18:31:51 +00:00

kmemleak.c

kmemleak: Allow kmemleak metadata allocations to fail

2011-01-27 18:32:06 +00:00

ksm.c

ksm: drain pagevecs to lru

2011-01-13 17:32:49 -08:00

maccess.c

MN10300: Save frame pointer in thread_info struct rather than global var

2010-10-27 17:29:01 +01:00

madvise.c

thp: khugepaged: make khugepaged aware about madvise

2011-01-13 17:32:47 -08:00

Makefile

thp: transparent hugepage core

2011-01-13 17:32:42 -08:00

memblock.c

memblock: don't adjust size in memblock_find_base()

2011-02-11 16:12:20 -08:00

memcontrol.c

memcg: fix event counting breakage from recent THP update

2011-02-02 16:03:19 -08:00

memory_hotplug.c

Merge branch 'slub/hotplug' into slab/urgent

2011-01-15 13:28:17 +02:00

memory-failure.c

block: remove per-queue plugging

2011-03-10 08:52:07 +01:00

memory.c

mm: prevent concurrent unmap_mapping_range() on the same inode

2011-02-23 19:52:52 -08:00

mempolicy.c

thp: fix interleaving for transparent hugepages

2011-02-25 15:07:37 -08:00

mempool.c

…

migrate.c

mm: grab rcu read lock in move_pages()

2011-02-25 15:07:36 -08:00

mincore.c

thp: mincore transparent hugepage support

2011-01-13 17:32:44 -08:00

mlock.c

mlock: operate on any regions with protection != PROT_NONE

2011-02-02 10:20:50 +11:00

mm_init.c

…

mmap.c

brk: fix min_brk lower bound computation for COMPAT_BRK

2011-01-13 17:32:48 -08:00

mmu_context.c

…

mmu_notifier.c

thp: mmu_notifier_test_young

2011-01-13 17:32:46 -08:00

mmzone.c

mm: page allocator: adjust the per-cpu counter threshold when memory is low

2011-01-13 17:32:31 -08:00

mprotect.c

thp: mprotect: transparent huge page support

2011-01-13 17:32:44 -08:00

mremap.c

mm: fix possible cause of a page_mapped BUG

2011-02-23 21:55:06 -08:00

msync.c

…

nommu.c

block: remove per-queue plugging

2011-03-10 08:52:07 +01:00

oom_kill.c

…

page_alloc.c

mm: fix dubious code in __count_immobile_pages()

2011-02-25 15:07:37 -08:00

page_cgroup.c

…

page_io.c

block: kill off REQ_UNPLUG

2011-03-10 08:52:27 +01:00

page_isolation.c

mm: page_isolation: codeclean fix comment and rm unneeded val init

2010-10-26 16:52:11 -07:00

page-writeback.c

block: remove per-queue plugging

2011-03-10 08:52:07 +01:00

pagewalk.c

thp: split_huge_page_mm/vma

2011-01-13 17:32:41 -08:00

percpu-km.c

…

percpu-vm.c

mm: remove gfp mask from pcpu_get_vm_areas

2011-01-13 17:32:34 -08:00

percpu.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2011-01-13 10:05:56 -08:00

pgtable-generic.c

mm/pgtable-generic.c: fix CONFIG_SWAP=n build

2011-01-26 10:49:58 +10:00

prio_tree.c

…

quicklist.c

…

readahead.c

read-ahead: use plugging

2011-03-10 08:52:26 +01:00

rmap.c

memcg: create extensible page stat update routines

2011-01-13 17:32:50 -08:00

shmem.c

block: remove per-queue plugging

2011-03-10 08:52:07 +01:00

slab.c

mm/slab.c: make local symbols static

2011-01-15 13:28:36 +02:00

slob.c

kernel: kmem_ptr_validate considered harmful

2011-01-07 17:50:16 +11:00

slub.c

Merge branch 'slub/hotplug' into slab/urgent

2011-01-15 13:28:17 +02:00

sparse-vmemmap.c

tree-wide: fix comment/printk typos

2010-11-01 15:38:34 -04:00

sparse.c

thp: remove PG_buddy

2011-01-13 17:32:43 -08:00

swap_state.c

block: remove per-queue plugging

2011-03-10 08:52:07 +01:00

swap.c

Revert "mm: simplify code of swap.c"

2011-01-17 14:42:34 -08:00

swapfile.c

Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core

2011-03-10 08:58:35 +01:00

thrash.c

…

truncate.c

memcg: more mem_cgroup_uncharge() batching

2011-02-25 15:07:37 -08:00

util.c

kernel: kmem_ptr_validate considered harmful

2011-01-07 17:50:16 +11:00

vmalloc.c

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2011-01-13 20:15:35 -08:00

vmscan.c

Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core

2011-03-10 08:58:35 +01:00

vmstat.c

thp: transparent hugepage vmstat

2011-01-13 17:32:43 -08:00