android_kernel_xiaomi_sm8350/drivers/acpi
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
..
dispatcher
events
executer
hardware
namespace
parser
resources
sleep
tables
utilities
ac.c
acpi_memhotplug.c
asus_acpi.c
battery.c
blacklist.c
bus.c
button.c
container.c
debug.c
dock.c
ec.c
event.c
fan.c
glue.c
hotkey.c
ibm_acpi.c
Kconfig
Makefile
motherboard.c
numa.c
osl.c
pci_bind.c
pci_irq.c
pci_link.c
pci_root.c
power.c
processor_core.c
processor_idle.c
processor_perflib.c
processor_thermal.c
processor_throttling.c
scan.c
system.c
tables.c
thermal.c
toshiba_acpi.c
utils.c
video.c