Stephen Boyd 84d1c1a3a3 Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4 ...

Fix NR_IPI to be 7 instead of 6 because both googly and core add
an IPI.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

Conflicts:
	arch/arm/Kconfig
	arch/arm/common/Makefile
	arch/arm/include/asm/hardware/cache-l2x0.h
	arch/arm/mm/cache-l2x0.c
	arch/arm/mm/mmu.c
	include/linux/wakelock.h
	kernel/power/Kconfig
	kernel/power/Makefile
	kernel/power/main.c
	kernel/power/power.h

2013-02-25 11:25:46 -08:00

..

backing-dev.c

backing-dev: fix wakeup timer races with bdi_unregister()

2012-02-01 16:52:49 +08:00

bootmem.c

bootmem/sparsemem: remove limit constraint in alloc_bootmem_section

2012-03-21 17:54:58 -07:00

bounce.c

mm: remove the second argument of k[un]map_atomic()

2012-03-20 21:48:27 +08:00

cleancache.c

mm: cleancache: Use __read_mostly as appropiate.

2012-01-23 16:08:09 -05:00

compaction.c

mm: compaction: make compact_control order signed

2012-03-21 17:54:56 -07:00

debug-pagealloc.c

…

dmapool.c

…

fadvise.c

…

failslab.c

…

filemap_xip.c

mm/filemap_xip.c: fix race condition in xip_file_fault()

2012-02-03 16:16:41 -08:00

filemap.c

radix-tree: use iterators in find_get_pages* functions

2012-03-28 17:14:37 -07:00

fremap.c

…

highmem.c

…

huge_memory.c

thp: optimize away unnecessary page table locking

2012-03-21 17:54:57 -07:00

hugetlb.c

hugetlb: prevent BUG_ON in hugetlb_fault() -> hugetlb_cow()

2012-05-10 15:06:44 -07:00

hwpoison-inject.c

…

init-mm.c

…

internal.h

…

Kconfig

ARM: allow memory hotplug/hotremove

2013-02-20 01:31:58 -08:00

Kconfig.debug

…

kmemcheck.c

…

kmemleak-test.c

…

kmemleak.c

kmemleak: Disable early logging when kmemleak is off by default

2012-01-20 16:57:05 +00:00

ksm.c

ksm: cleanup: introduce find_mergeable_vma()

2012-03-21 17:54:59 -07:00

maccess.c

…

madvise.c

coredump: add VM_NODUMP, MADV_NODUMP, MADV_CLEAR_NODUMP

2012-03-23 16:58:42 -07:00

Makefile

…

memblock.c

memblock: Add memblock_overlaps_memory()

2013-02-20 02:43:56 -08:00

memcontrol.c

memcg,thp: fix res_counter:96 regression

2012-05-19 10:10:27 -07:00

memory_hotplug.c

mm: make physical memory offline work

2013-02-20 02:44:04 -08:00

memory-failure.c

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

2012-03-22 09:42:04 -07:00

memory.c

coredump: remove VM_ALWAYSDUMP flag

2012-03-23 16:58:42 -07:00

mempolicy.c

mm: fix NULL ptr dereference in migrate_pages

2012-04-25 21:26:34 -07:00

mempool.c

…

migrate.c

mm: fix NULL ptr dereference in move_pages

2012-04-25 21:26:34 -07:00

mincore.c

mm: thp: fix pmd_bad() triggering in code paths holding mmap_sem read mode

2012-03-21 17:54:54 -07:00

mlock.c

vm: avoid using find_vma_prev() unnecessarily

2012-03-06 18:23:36 -08:00

mm_init.c

…

mmap.c

kill mm argument of vm_munmap()

2012-04-21 01:58:20 -04:00

mmu_context.c

mm, counters: remove task argument to sync_mm_rss() and __sync_task_rss_stat()

2012-03-21 17:54:59 -07:00

mmu_notifier.c

…

mmzone.c

…

mprotect.c

Merge branch 'akpm' (Andrew's patch-bomb)

2012-03-22 09:04:48 -07:00

mremap.c

mm: collapse security_vm_enough_memory() variants into a single function

2012-02-14 10:45:39 +11:00

msync.c

…

nobootmem.c

mm: nobootmem: fix sign extend problem in __free_pages_memory()

2012-05-10 15:06:44 -07:00

nommu.c

kill mm argument of vm_munmap()

2012-04-21 01:58:20 -04:00

oom_kill.c

signal: oom_kill_task: use SEND_SIG_FORCED instead of force_sig()

2012-03-23 16:58:41 -07:00

page_alloc.c

Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4

2013-02-25 11:25:46 -08:00

page_cgroup.c

page_cgroup: fix horrid swap accounting regression

2012-03-06 08:18:23 -08:00

page_io.c

…

page_isolation.c

…

page-writeback.c

Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2012-03-28 10:02:55 -07:00

pagewalk.c

mm: thp: fix pmd_bad() triggering in code paths holding mmap_sem read mode

2012-03-21 17:54:54 -07:00

percpu-km.c

…

percpu-vm.c

percpu: use bitmap_clear

2012-01-20 09:23:16 -08:00

percpu.c

kmemleak: Fix the kmemleak tracking of the percpu areas with !SMP

2012-05-09 10:13:29 -07:00

pgtable-generic.c

thp: add HPAGE_PMD_* definitions for !CONFIG_TRANSPARENT_HUGEPAGE

2012-03-21 17:55:02 -07:00

prio_tree.c

…

process_vm_access.c

Fix race in process_vm_rw_core

2012-02-02 12:55:17 -08:00

quicklist.c

…

readahead.c

…

rmap.c

memcg: use new logic for page stat accounting

2012-03-21 17:55:01 -07:00

shmem.c

ashmem: Add shmem_set_file to mm/shmem.c

2012-04-09 13:53:14 -07:00

slab.c

Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux

2012-03-28 15:04:26 -07:00

slob.c

…

slub.c

slub: missing test for partial pages flush work in flush_all()

2012-05-17 18:00:51 -07:00

sparse-vmemmap.c

…

sparse.c

msm: mm: Fix errors when turning on SPARSEMEM

2013-02-20 02:43:57 -08:00

swap_state.c

mm: fix s390 BUG by __set_page_dirty_no_writeback on swap

2012-04-23 18:19:22 -07:00

swap.c

mm: drain percpu lru add/rotate page-vectors on cpu hot-unplug

2012-03-21 17:54:58 -07:00

swapfile.c

swapon: check validity of swap_flags

2012-03-28 17:14:35 -07:00

thrash.c

…

truncate.c

mm for fs: add truncate_pagecache_range()

2012-03-28 17:14:35 -07:00

util.c

procfs: mark thread stack correctly in proc/<pid>/maps

2012-03-21 17:54:58 -07:00

vmalloc.c

mm: fix faulty initialization in vmalloc_init()

2013-02-20 02:43:59 -08:00

vmscan.c

mm: fix up the vmscan stat in vmstat

2012-04-25 21:26:33 -07:00

vmstat.c

mm: fix up the vmscan stat in vmstat

2012-04-25 21:26:33 -07:00