android_kernel_xiaomi_sm7250/mm
Linus Torvalds 22a3e233ca Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  Remove obsolete #include <linux/config.h>
  remove obsolete swsusp_encrypt
  arch/arm26/Kconfig typos
  Documentation/IPMI typos
  Kconfig: Typos in net/sched/Kconfig
  v9fs: do not include linux/version.h
  Documentation/DocBook/mtdnand.tmpl: typo fixes
  typo fixes: specfic -> specific
  typo fixes in Documentation/networking/pktgen.txt
  typo fixes: occuring -> occurring
  typo fixes: infomation -> information
  typo fixes: disadvantadge -> disadvantage
  typo fixes: aquire -> acquire
  typo fixes: mecanism -> mechanism
  typo fixes: bandwith -> bandwidth
  fix a typo in the RTC_CLASS help text
  smb is no longer maintained

Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
2006-06-30 15:39:30 -07:00
..
bootmem.c
fadvise.c
filemap_xip.c
filemap.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
filemap.h [PATCH] generic_file_buffered_write(): handle zero-length iovec segments 2006-06-29 10:26:20 -07:00
fremap.c
highmem.c [PATCH] zoned vm counters: conversion of nr_bounce to per zone counter 2006-06-30 11:25:36 -07:00
hugetlb.c
internal.h
Kconfig Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 2006-06-29 10:49:17 -07:00
madvise.c
Makefile [PATCH] zoned vm counters: create vmstat.c/.h from page_alloc.c/.h 2006-06-30 11:25:34 -07:00
memory_hotplug.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
memory.c [PATCH] Light weight event counters 2006-06-30 11:25:36 -07:00
mempolicy.c [PATCH] Use Zoned VM Counters for NUMA statistics 2006-06-30 11:25:36 -07:00
mempool.c
migrate.c
mincore.c
mlock.c
mmap.c [PATCH] zoned vm counters: conversion of nr_pagecache to per zone counter 2006-06-30 11:25:34 -07:00
mmzone.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mprotect.c
mremap.c
msync.c
nommu.c [PATCH] zoned vm counters: conversion of nr_pagecache to per zone counter 2006-06-30 11:25:34 -07:00
oom_kill.c
page_alloc.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
page_io.c [PATCH] Light weight event counters 2006-06-30 11:25:36 -07:00
page-writeback.c [PATCH] zoned vm counters: remove useless struct wbs 2006-06-30 11:25:36 -07:00
pdflush.c
prio_tree.c
readahead.c
rmap.c [PATCH] zoned vm counters: split NR_ANON_PAGES off from NR_FILE_MAPPED 2006-06-30 11:25:35 -07:00
shmem.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
slab.c [PATCH] slab: consolidate code to free slabs from freelist 2006-06-30 11:25:36 -07:00
slob.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sparse.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
swap_state.c [PATCH] zoned vm counters: conversion of nr_pagecache to per zone counter 2006-06-30 11:25:34 -07:00
swap.c [PATCH] Light weight event counters 2006-06-30 11:25:36 -07:00
swapfile.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
thrash.c
tiny-shmem.c
truncate.c
util.c
vmalloc.c
vmscan.c [PATCH] Light weight event counters 2006-06-30 11:25:36 -07:00
vmstat.c [PATCH] Light weight event counters 2006-06-30 11:25:36 -07:00