android_kernel_xiaomi_sm8350/drivers/pci/hotplug
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
..
acpi_pcihp.c
acpiphp_core.c ACPIPHP: use ACPI dock driver 2006-06-28 03:08:06 -04:00
acpiphp_glue.c ACPIPHP: prevent duplicate slot numbers when no _SUN 2006-06-28 03:09:54 -04:00
acpiphp_ibm.c
acpiphp.h ACPI: static-ize handle_hotplug_event_func() 2006-06-28 03:08:46 -04:00
cpci_hotplug_core.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cpci_hotplug_pci.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cpci_hotplug.h
cpcihp_generic.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cpcihp_zt5550.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cpcihp_zt5550.h
cpqphp_core.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cpqphp_ctrl.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cpqphp_nvram.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cpqphp_nvram.h
cpqphp_pci.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cpqphp_sysfs.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cpqphp.h
fakephp.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibmphp_core.c [PATCH] PCI Hotplug: fake NULL pointer dereferences in IBM Hot Plug Controller Driver 2006-06-19 14:13:24 -07:00
ibmphp_ebda.c
ibmphp_hpc.c
ibmphp_pci.c
ibmphp_res.c
ibmphp.h
Kconfig
Makefile ACPIPHP: use ACPI dock driver 2006-06-28 03:08:06 -04:00
pci_hotplug_core.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
pci_hotplug.h
pciehp_core.c [PATCH] pciehp: Implement get_address callback 2006-06-19 14:13:23 -07:00
pciehp_ctrl.c
pciehp_hpc.c [PATCH] 64bit resource: fix up printks for resources in pci core and hotplug drivers 2006-06-27 09:23:58 -07:00
pciehp_pci.c
pciehp.h
pcihp_skeleton.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
rpadlpar_core.c
rpadlpar_sysfs.c
rpadlpar.h
rpaphp_core.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
rpaphp_pci.c
rpaphp_slot.c
rpaphp.h
sgi_hotplug.c
shpchp_core.c
shpchp_ctrl.c [PATCH] shpchp: Cleanup improper info messages 2006-06-19 14:13:24 -07:00
shpchp_hpc.c [PATCH] shpchp: Remove Unused hpc_evelnt_lock 2006-06-19 14:13:24 -07:00
shpchp_pci.c
shpchp_sysfs.c [PATCH] 64bit resource: fix up printks for resources in pci core and hotplug drivers 2006-06-27 09:23:58 -07:00
shpchp.h [PATCH] shpchp: Cleanup improper info messages 2006-06-19 14:13:24 -07:00