linux/drivers/acpi
Linus Torvalds 008d23e485 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
2011-01-13 10:05:56 -08:00
..
acpica Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
apei Fix spelling mistakes in comments 2011-01-03 13:51:58 +01:00
ac.c ACPI ac: update AC status upon sysfs query 2010-12-09 15:33:08 -05:00
acpi_memhotplug.c
acpi_pad.c
atomicio.c
battery.c Revert "ACPI battery: update status upon sysfs query" 2010-12-24 21:43:16 -05:00
blacklist.c
bus.c
button.c
cm_sbs.c
container.c
debugfs.c ACPI: debugfs custom_method open to non-root 2010-11-13 09:52:16 -08:00
dock.c
ec_sys.c
ec.c ACPI: EC: Add another dmi match entry for MSI hardware 2010-12-09 17:08:46 -05:00
event.c
fan.c
glue.c
hed.c
internal.h
Kconfig
Makefile
numa.c x86, acpi: Parse all SRAT cpu entries even above the cpu number limitation 2010-12-23 13:16:18 -08:00
osl.c Merge branches 'bugzilla-15418', 'bugzilla-21722', 'bugzilla-22932', 'misc-2.6.37' and 'osi-regression' into release 2010-12-11 02:02:02 -05:00
pci_bind.c
pci_irq.c
pci_link.c
pci_root.c
pci_slot.c
power_meter.c
power.c ACPI / PM: Do not refcount power resources that can't be turned on 2010-12-01 16:53:39 -05:00
proc.c
processor_core.c
processor_driver.c
processor_idle.c drivers: Replace __get_cpu_var with __this_cpu_read if not used for an address. 2010-12-17 15:07:18 +01:00
processor_perflib.c
processor_thermal.c ACPI thermal: remove two unused functions 2010-12-11 02:01:47 -05:00
processor_throttling.c
reboot.c
sbs.c
sbshc.c
sbshc.h
scan.c ACPI: Execute _PRW for devices reported as inactive or not present 2010-12-17 16:39:11 -05:00
sleep.c Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
sleep.h
sysfs.c
tables.c
thermal.c
utils.c
video_detect.c
video.c backlight: constify backlight_ops 2010-11-16 14:14:02 +01:00
wakeup.c