original_kernel/drivers/base
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
..
power Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
Kconfig
Makefile
attribute_container.c
base.h
bus.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
class.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
core.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cpu.c [PATCH] sched: mc/smt power savings sched policy 2006-06-27 17:32:45 -07:00
dd.c
dmapool.c [PATCH] add poison.h and patch primary users 2006-06-27 17:32:38 -07:00
driver.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
firmware.c
firmware_class.c
hypervisor.c
init.c
isa.c
map.c
memory.c
node.c [PATCH] Use Zoned VM Counters for NUMA statistics 2006-06-30 11:25:36 -07:00
platform.c
sys.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
topology.c [PATCH] cpu hotplug: make cpu_notifier related notifier blocks __cpuinit only 2006-06-27 17:32:41 -07:00
transport_class.c