android_kernel_xiaomi_sm8350/arch/um/sys-i386
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
..
bugs.c
checksum.S Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
delay.c
fault.c
ksyms.c [PATCH] uml: fix some double export warnings 2006-04-11 06:18:36 -07:00
ldt.c
Makefile [PATCH] uml: cleanup unprofile expression and build infrastructure 2006-05-01 18:17:45 -07:00
ptrace_user.c [PATCH] uml: fix format errors 2006-04-11 06:18:36 -07:00
ptrace.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sigcontext.c
signal.c [PATCH] uml: __user annotations 2006-04-19 09:13:51 -07:00
stub_segv.c [PATCH] uml: add missing __volatile__ 2006-04-19 09:13:51 -07:00
stub.S
sys_call_table.S [PATCH] uml: remove unneeded time definitions 2006-06-30 11:25:38 -07:00
syscalls.c [PATCH] uml: more __user annotations 2006-06-05 12:29:17 -07:00
sysrq.c
tls.c [PATCH] UML: TLS fixlets 2006-04-11 06:18:35 -07:00
unmap.c
user-offsets.c [PATCH] uml: move libc-dependent irq code to os-Linux 2006-03-27 08:44:37 -08:00