From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Apr 2010 14:44:53 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... 
X-Git-Tag: firefly_0821_release~9833^2~2381
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0a2851b9a837cb025d48bb8118f35ebd12bce4b5;p=firefly-linux-kernel-4.4.55.git

Merge branch 'release' of git://git./linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI / PM: Move ACPI video resume to a PM notifier
  ACPI: Reduce ACPI resource conflict message to KERN_WARNING, printk cleanup
  ACPI: battery drivers should call power_supply_changed()
  ACPI: battery: Fix CONFIG_ACPI_SYSFS_POWER=n
  PNPACPI: truncate _CRS windows with _LEN > _MAX - _MIN + 1
  ACPI: Don't send KEY_UNKNOWN for random video notifications
  ACPI: NUMA: map pxms to low node ids
  ACPI: use _HID when supplied by root-level devices
  ACPI / ACPICA: Do not check reference counters in acpi_ev_enable_gpe()
  ACPI: fixes a false alarm from lockdep
  ACPI dock: support multiple ACPI dock devices
  ACPI: EC: Allow multibyte access to EC
---

0a2851b9a837cb025d48bb8118f35ebd12bce4b5