mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'sfi-base' into release
Conflicts: drivers/acpi/power.c Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
commit
003d6a38ce
37 changed files with 96 additions and 12 deletions
|
|
@ -35,8 +35,7 @@
|
|||
#include <linux/interrupt.h>
|
||||
#include <linux/tboot.h>
|
||||
|
||||
#undef PREFIX
|
||||
#define PREFIX "DMAR:"
|
||||
#define PREFIX "DMAR: "
|
||||
|
||||
/* No locks are needed as DMA remapping hardware unit
|
||||
* list is constructed at boot time and hotplug of
|
||||
|
|
|
|||
Loading…
Reference in a new issue