From: Len Brown <len.brown@intel.com>
Date: Sun, 7 Oct 2012 03:06:11 +0000 (-0400)
Subject: Merge branch 'upstream' into next
X-Git-Tag: next-20121008~53^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=558dc6f9ee2a6c686c80b9cdf3426858d2b8dbd1;p=karo-tx-linux.git

Merge branch 'upstream' into next

Signed-off-by: Len Brown <len.brown@intel.com>

Conflicts:
	drivers/usb/core/usb-acpi.c
		removed usb_acpi_check_pld() on main, vs
		updated parames to a call it made on old acpica brance

	include/acpi/acpixf.h
		added a header vs added <> syntax
---

558dc6f9ee2a6c686c80b9cdf3426858d2b8dbd1
diff --cc include/acpi/acpixf.h
index 267bfc4b26a9,51405d32ac64..7ddda69e4d02
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@@ -47,12 -47,11 +47,12 @@@
  
  /* Current ACPICA subsystem version in YYYYMMDD format */
  
 -#define ACPI_CA_VERSION                 0x20120711
 +#define ACPI_CA_VERSION                 0x20120913
  
- #include "acconfig.h"
- #include "actypes.h"
- #include "actbl.h"
- #include "acbuffer.h"
+ #include <acpi/acconfig.h>
+ #include <acpi/actypes.h>
+ #include <acpi/actbl.h>
++#include <acbuffer.h">
  
  extern u8 acpi_gbl_permanent_mmap;