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

author	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Tue, 27 May 2014 16:11:38 +0000 (18:11 +0200)
committer	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Tue, 27 May 2014 16:11:38 +0000 (18:11 +0200)
commit	6d14b79eb8bc3ead60ae21ee63292076ce615a0d
tree	7820cae684404d2bd26814a327f0e2809724dd33	tree \| snapshot
parent	d0fc01b75e7760d459fb553b6127b914aefb7182	commit \| diff
parent	8dbff9524cf4ef4da70a81305000f50b89b3913a	commit \| diff

Merge back earlier ACPICA material.

Conflicts:
drivers/acpi/acpica/acglobal.h