mkottman/acpi_call — pull request #52 by simbuerg (2014-10-28 00:55:14+00:00)
Title: Use linux/acpi.h instead of acpi/acpi.h

This fixes a small build error when building against recent kernels (kernel 3.17)

The conflicting change is this one:
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=417b4a73b62760db67512892c32f8acc008ab54e