git.baikalelectronics.ru Git - kernel.git/commit

Merge branches 'acpi-video' and 'acpi-pmic'

* 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

author	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Mon, 8 Dec 2014 18:54:45 +0000 (19:54 +0100)
committer	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Mon, 8 Dec 2014 18:54:45 +0000 (19:54 +0100)
commit	67d84c55ef7ad9a0799882b332fe8070d8d718e6
tree	99b7057f592ca95352a153a03fb1eb55a9cfe90a	tree \| snapshot
parent	e96d7da1403bcfcc14130b369793dc87d805fcd6	commit \| diff
parent	1ebed8b56dc9396076c30e86fee7adc367a303d9	commit \| diff
parent	a5a5fc5e44dbe04c69bc313f12f986cb9ea1b6b8	commit \| diff

drivers/acpi/Kconfig	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/acpi/Makefile	diff1 \|	diff2 \|	diff3 \|	blob \| history