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

author	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Sun, 27 Jul 2014 21:55:35 +0000 (23:55 +0200)
committer	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Sun, 27 Jul 2014 21:55:35 +0000 (23:55 +0200)
commit	3c547018fb8424ea2cc6a949749f7d9d9f21db62
tree	c946115b4215c95c91bc18e26fe41daa12ebdb44	tree \| snapshot
parent	d4796e8c99c9ff2401c6b54ad2bb7cf6a39d3b2f	commit \| diff
parent	9929dca3890037fd38e579f7d535fcc42ef882fa	commit \| diff
parent	db77e87a290cee648bdd8872a2cd7d1b4fc2e4cf	commit \| diff

Merge branches 'acpi-pnp' and 'acpi-pci'

* acpi-pnp:
  ACPI / PNP: Use ACPI_COMPANION() instead of ACPI_HANDLE()
  ACPI / PNP: do ACPI binding directly

* acpi-pci:
  ACPI / PCI: Use ACPI_COMPANION() instead of ACPI_HANDLE()

drivers/acpi/internal.h	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/pci/pci-acpi.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
include/acpi/acpi_bus.h	diff1 \|	diff2 \|	diff3 \|	blob \| history