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

ACPI: ACPICA 20060623

2006-06-28 03:11:38 -04:00

events

ACPI: ACPICA 20060623

2006-06-28 03:11:38 -04:00

executer

ACPI: ACPICA 20060623

2006-06-28 03:11:38 -04:00

hardware

ACPI: ACPICA 20060623

2006-06-28 03:11:38 -04:00

namespace

ACPI: ACPICA 20060623

2006-06-28 03:11:38 -04:00

parser

ACPI: ACPICA 20060623

2006-06-28 03:11:38 -04:00

resources

ACPI: ACPICA 20060526

2006-06-14 02:44:35 -04:00

sleep

Pull button into release branch

2006-06-15 23:17:14 -04:00

tables

ACPI: ACPICA 20060608

2006-06-14 02:45:47 -04:00

utilities

ACPI: ACPICA 20060623

2006-06-28 03:11:38 -04:00

ac.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

acpi_memhotplug.c

ACPI: fixup memhotplug debug message

2006-06-30 03:40:01 -04:00

asus_acpi.c

ACPI: asus_acpi_init: propagate correct return value

2006-06-27 01:07:16 -04:00

battery.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

blacklist.c

[PATCH] x86_64: Clean up and tweak ACPI blacklist year code

2006-03-25 09:10:54 -08:00

bus.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

button.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

container.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

debug.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

dock.c

ACPI: dock driver

2006-06-28 03:07:16 -04:00

ec.c

ACPI: fix battery on HP NX6125

2006-06-28 12:44:45 -04:00

event.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

fan.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

glue.c

[ACPI] ACPICA 20050930

2005-12-10 00:20:25 -05:00

hotkey.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

ibm_acpi.c

ACPI: Allow a WAN module enable/disable on a Thinkpad X60.

2006-06-01 20:42:32 -04:00

Kconfig

merge linus into release branch

2006-06-29 19:57:46 -04:00

Makefile

ACPI: dock driver

2006-06-28 03:07:16 -04:00

motherboard.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

numa.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

osl.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

2006-06-30 15:39:30 -07:00

pci_bind.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

pci_irq.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

2006-06-30 15:39:30 -07:00

pci_link.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

pci_root.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

power.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

processor_core.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

processor_idle.c

Pull c-states into release branch

2006-06-29 15:58:09 -04:00

processor_perflib.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

processor_thermal.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

processor_throttling.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

scan.c

ACPI: drivers/acpi/scan.c: make acpi_bus_type static

2006-06-30 14:28:50 -04:00

system.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

tables.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

thermal.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

toshiba_acpi.c

[ACPI] Lindent all ACPI files

2005-08-05 00:45:14 -04:00

utils.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00

video.c

ACPI: delete tracing macros from drivers/acpi/*.c

2006-06-27 00:41:40 -04:00