Merge branch 'misc-2.6.32' into release
Conflicts: drivers/pci/dmar.c Signed-off-by: Len Brown <len.brown@intel.com>
Šī revīzija ir iekļauta:
Len Brown
@@ -40,7 +40,7 @@
|
||||
#include <linux/pci.h>
|
||||
#include <linux/pci_ids.h>
|
||||
#include <asm/uaccess.h>
|
||||
|
||||
#include <linux/dmi.h>
|
||||
#include <acpi/acpi_bus.h>
|
||||
#include <acpi/acpi_drivers.h>
|
||||
|
||||
|
||||
Atsaukties uz šo jaunā problēmā
Block a user