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

author	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Tue, 18 Mar 2014 00:53:28 +0000 (01:53 +0100)
committer	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Tue, 18 Mar 2014 00:53:28 +0000 (01:53 +0100)
commit	e3c14a6d2fa1b8458d3e54260b9b081338530709
tree	751337a429d58b60e03e22d2a30fccd87e1bc02a	tree \| snapshot
parent	4a2ac73b617922e9e980f41d148e4549de65e961	commit \| diff
parent	8813c5175282fcfda920566156868328a24d5bc4	commit \| diff

Merge branch 'acpi-config' into acpica

Conflicts:
include/acpi/platform/aclinux.h