Trond Myklebust 816724e65c Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ ...

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

2006-06-24 13:07:53 -04:00

..

bootmem.c

[PATCH] x86_64: Handle empty PXMs that only contain hotplug memory

2006-04-09 11:53:16 -07:00

fadvise.c

[PATCH] sys_sync_file_range()

2006-03-31 12:18:54 -08:00

filemap_xip.c

[PATCH] replace inode_update_time with file_update_time

2006-01-10 08:01:30 -08:00

filemap.c

[PATCH] x86: cache pollution aware __copy_from_user_ll()

2006-06-23 07:42:56 -07:00

filemap.h

[PATCH] x86: cache pollution aware __copy_from_user_ll()

2006-06-23 07:42:56 -07:00

fremap.c

[PATCH] fix update_mmu_cache in fremap.c

2006-06-23 07:42:52 -07:00

highmem.c

BUG_ON() Conversion in mm/highmem.c

2006-04-02 13:47:35 +02:00

hugetlb.c

[PATCH] tightening hugetlb strict accounting

2006-06-23 07:42:48 -07:00

internal.h

[PATCH] remove set_page_count() outside mm/

2006-03-22 07:54:02 -08:00

Kconfig

[PATCH] Swapless page migration: modify core logic

2006-06-23 07:42:50 -07:00

madvise.c

[PATCH] Fix MADV_REMOVE protection checking

2006-04-17 18:22:18 -07:00

Makefile

[PATCH] uninline zone helpers

2006-03-27 08:44:48 -08:00

memory_hotplug.c

[PATCH] update vm_total_pages at memory hotadd

2006-06-23 07:42:52 -07:00

memory.c

[PATCH] add page_mkwrite() vm_operations method

2006-06-23 07:42:51 -07:00

mempolicy.c

[PATCH] SELinux: add security_task_movememory calls to mm code

2006-06-23 07:42:54 -07:00

mempool.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

2006-03-26 09:41:18 -08:00

migrate.c

[PATCH] SELinux: add security_task_movememory calls to mm code

2006-06-23 07:42:54 -07:00

mincore.c

[PATCH] freepgt: sys_mincore ignore FIRST_USER_PGD_NR

2005-04-19 13:29:20 -07:00

mlock.c

[PATCH] move capable() to capability.h

2006-01-11 18:42:13 -08:00

mmap.c

[PATCH] add page_mkwrite() vm_operations method

2006-06-23 07:42:51 -07:00

mmzone.c

[PATCH] uninline zone helpers

2006-03-27 08:44:48 -08:00

mprotect.c

[PATCH] add page_mkwrite() vm_operations method

2006-06-23 07:42:51 -07:00

mremap.c

[PATCH] move capable() to capability.h

2006-01-11 18:42:13 -08:00

msync.c

[PATCH] Kill PF_SYNCWRITE flag

2006-06-23 17:10:39 +02:00

nommu.c

[PATCH] overcommit: use totalreserve_pages for nommu

2006-04-11 06:18:32 -07:00

oom_kill.c

[PATCH] mm: fix typos in comments in mm/oom_kill.c

2006-06-23 07:42:47 -07:00

page_alloc.c

[PATCH] printk() should not be called under zone->lock

2006-06-23 07:42:52 -07:00

page_io.c

[PATCH] mm: split page table lock

2005-10-29 21:40:42 -07:00

page-writeback.c

[PATCH] writeback: fix range handling

2006-06-23 07:42:49 -07:00

pdflush.c

[PATCH] More BUG_ON conversion

2006-06-23 07:43:08 -07:00

prio_tree.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

readahead.c

[PATCH] ext3_readdir: use generic readahead

2006-03-23 07:38:09 -08:00

rmap.c

[PATCH] More page migration: use migration entries for file pages

2006-06-23 07:42:51 -07:00

shmem.c

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2006-06-24 13:07:53 -04:00

slab.c

[PATCH] slab: kmalloc, kzalloc comments cleanup and fix

2006-06-23 07:42:52 -07:00

slob.c

[PATCH] mm/slob.c: for_each_possible_cpu(), not NR_CPUS

2006-04-19 09:13:49 -07:00

sparse.c

[PATCH] sparsemem: record nid during memory present

2006-06-23 07:42:51 -07:00

swap_state.c

BUG_ON() Conversion in mm/swap_state.c

2006-04-01 01:25:12 +02:00

swap.c

[PATCH] percpu_counters: create lib/percpu_counter.c

2006-06-23 07:43:06 -07:00

swapfile.c

[PATCH] read_mapping_page for address space

2006-06-23 07:43:02 -07:00

thrash.c

[PATCH] temporarily disable swap token on memory pressure

2005-11-28 14:42:25 -08:00

tiny-shmem.c

[PATCH] do_truncate() call fix in tiny-shmem.c

2006-01-12 09:08:49 -08:00

truncate.c

[PATCH] Remove semi-softlockup from invalidate_mapping_pages

2006-06-23 07:43:07 -07:00

util.c

[PATCH] slab: optimize constant-size kzalloc calls

2006-03-25 08:22:49 -08:00

vmalloc.c

[PATCH] mm: introduce remap_vmalloc_range()

2006-06-23 07:42:49 -07:00

vmscan.c

[PATCH] initialise total_memory() earlier

2006-06-23 07:42:52 -07:00