Benjamin Herrenschmidt 84c3d4aaec Merge commit 'origin/master' ...

Manual merge of:

	arch/powerpc/Kconfig
	arch/powerpc/kernel/stacktrace.c
	arch/powerpc/mm/slice.c
	arch/ppc/kernel/smp.c

2008-07-16 11:07:59 +10:00

..

allocpercpu.c

Christoph has moved

2008-07-04 10:40:04 -07:00

backing-dev.c

mm: bdi: fix race in bdi_class device creation

2008-05-20 13:31:53 -07:00

bootmem.c

Add return value to reserve_bootmem_node()

2008-06-21 11:25:10 -07:00

bounce.c

…

dmapool.c

dmapool: enable debugging for CONFIG_SLUB_DEBUG_ON too

2008-04-28 08:58:20 -07:00

fadvise.c

xip: support non-struct page backed memory

2008-04-28 08:58:23 -07:00

filemap_xip.c

xip: support non-struct page backed memory

2008-04-28 08:58:23 -07:00

filemap.c

vfs: export filemap_fdatawrite_range()

2008-07-11 19:27:31 -04:00

fremap.c

mm: fix various kernel-doc comments

2008-03-19 18:53:35 -07:00

highmem.c

mm: highmem kernel-doc additions

2008-03-19 18:53:35 -07:00

hugetlb.c

hugetlb: fix lockdep error

2008-06-06 11:29:09 -07:00

internal.h

memory hotplug: free memmaps allocated by bootmem

2008-04-28 08:58:26 -07:00

Kconfig

Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

2008-07-14 13:37:29 -07:00

maccess.c

kgdb: fix optional arch functions and probe_kernel_*

2008-04-17 20:05:39 +02:00

madvise.c

xip: support non-struct page backed memory

2008-04-28 08:58:23 -07:00

Makefile

uaccess: add probe_kernel_write()

2008-04-17 20:05:36 +02:00

memcontrol.c

memcg: simple stats for memory resource controller

2008-05-01 08:04:02 -07:00

memory_hotplug.c

memory_hotplug: always initialize pageblock bitmap

2008-05-14 19:11:15 -07:00

memory.c

get_user_pages(): fix possible page leak on oom

2008-07-04 10:40:04 -07:00

mempolicy.c

mempolicy: mask off internal flags for userspace API

2008-07-04 13:03:05 -07:00

mempool.c

…

migrate.c

Christoph has moved

2008-07-04 10:40:04 -07:00

mincore.c

mm: remove nopage

2008-04-28 08:58:18 -07:00

mlock.c

…

mmap.c

mm: Allow architectures to define additional protection bits

2008-07-09 16:30:45 +10:00

mmzone.c

mm: filter based on a nodemask as well as a gfp_mask

2008-04-28 08:58:19 -07:00

mprotect.c

Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build

2008-07-15 15:44:51 +10:00

mremap.c

…

msync.c

…

nommu.c

nommu: Correct kobjsize() page validity checks.

2008-06-12 07:56:17 -07:00

oom_kill.c

oom_kill: remove unused parameter in badness()

2008-04-28 08:58:26 -07:00

page_alloc.c

Merge branch 'generic-ipi' into generic-ipi-for-linus

2008-07-15 21:55:59 +02:00

page_io.c

…

page_isolation.c

…

page-writeback.c

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2008-07-15 08:36:38 -07:00

pagewalk.c

pagemap: pass mm into pagewalkers

2008-06-12 18:05:41 -07:00

pdflush.c

mm/pdflush.c: merge the same code in two path

2008-05-13 08:02:24 -07:00

prio_tree.c

…

quicklist.c

…

readahead.c

mm: bdi: export BDI attributes in sysfs

2008-04-30 08:29:49 -07:00

rmap.c

mm: remove nopage

2008-04-28 08:58:18 -07:00

shmem_acl.c

…

shmem.c

mm: bdi: add separate writeback accounting capability

2008-04-30 08:29:50 -07:00

slab.c

Merge branch 'generic-ipi' into generic-ipi-for-linus

2008-07-15 21:55:59 +02:00

slob.c

slob: Fix to return wrong pointer

2008-05-19 20:55:25 +03:00

slub.c

Merge branch 'generic-ipi' into generic-ipi-for-linus

2008-07-15 21:55:59 +02:00

sparse-vmemmap.c

Christoph has moved

2008-07-04 10:40:04 -07:00

sparse.c

revert "memory hotplug: allocate usemap on the section with pgdat"

2008-04-30 08:29:55 -07:00

swap_state.c

mm: bdi: add separate writeback accounting capability

2008-04-30 08:29:50 -07:00

swap.c

mm: fix atomic_t overflow in vm

2008-05-24 09:56:09 -07:00

swapfile.c

mm: use non-racy method for /proc/swaps creation

2008-04-29 08:06:20 -07:00

thrash.c

…

tiny-shmem.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

2008-03-25 08:57:47 -07:00

truncate.c

fix invalidate_inode_pages2_range() to not clear ret

2008-04-28 08:58:18 -07:00

util.c

…

vmalloc.c

docbook: fix vmalloc missing parameter notation

2008-05-01 08:03:59 -07:00

vmscan.c

mm: fix incorrect variable type in do_try_to_free_pages()

2008-06-12 18:05:39 -07:00

vmstat.c

make vmstat cpu-unplug safe

2008-05-13 08:02:23 -07:00