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

diff --cc include/acpi/acpixf.h
index 267bfc4b26a9b78f4c0f83eb92b0140c656bce9a,51405d32ac64366b514c338792ef622446271c36..7ddda69e4d0256a3fa5e8a9ae267acdf0f8f0816
--- 1/include/acpi/acpixf.h
--- 2/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;