]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
projects / thirdparty / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69bad36 667ae4e 491cb35)
Merge branches 'acpi-video' and 'acpi-pmic'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 8 Dec 2014 18:54:45 +0000 (19:54 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 8 Dec 2014 18:54:45 +0000 (19:54 +0100)
* acpi-video:
  ACPI / video: Run _BCL before deciding registering backlight

* acpi-pmic:
  ACPI / PMIC: AXP288: support virtual GPIO in ACPI table
  ACPI / PMIC: support PMIC operation region for XPower AXP288
  ACPI / PMIC: support PMIC operation region for CrystalCove
  iio/axp288_adc: remove THIS_MODULE owner
  mfd/axp20x: avoid irq numbering collision
  iio: adc: Add module device table for autoloading
  iio: adc: Add support for axp288 adc
  mfd: axp20x: Extend axp20x to support axp288 pmic

1  2  3 
drivers/acpi/Kconfig patch | diff1 | diff2 | diff3 | blob | history
drivers/acpi/Makefile patch | diff1 | diff2 | diff3 | blob | history

diff --cc drivers/acpi/Kconfig
Simple merge
diff --cc drivers/acpi/Makefile
Simple merge
A mirror of Linus' kernel repository