mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'misc-2.6.32' into release
Conflicts: drivers/pci/dmar.c Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
commit
d26f0528d5
9 changed files with 41 additions and 54 deletions
|
|
@ -34,6 +34,7 @@
|
|||
#include <linux/irq.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/tboot.h>
|
||||
#include <linux/dmi.h>
|
||||
|
||||
#define PREFIX "DMAR: "
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue