Merge tag 'v3.0.36' into uek2-2.6.39-300#14252075

This is the 3.0.36 stable release

Conflicts:
	arch/x86/xen/enlighten.c
	include/linux/pci.h

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>

diff --cc Makefile
Simple merge

diff --cc arch/x86/xen/enlighten.c
index 4390dbd0b2c445caf22e998d2e6ad88be5fb3ac2,8385d1d33f3160ab527db1aceb2a94332fe2740c..35dcd92f46954945b4d31ace789e16687ce35532
--- 1/arch/x86/xen/enlighten.c
--- 2/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@@ -236,14 -221,11 +239,19 @@@ static void xen_cpuid(unsigned int *ax
                maskedx = cpuid_leaf1_edx_mask;
                break;
  
 +      case CPUID_MWAIT_LEAF:
 +              /* Synthesize the values.. */
 +              *ax = 0;
 +              *bx = 0;
 +              *cx = cpuid_leaf5_ecx_val;
 +              *dx = cpuid_leaf5_edx_val;
 +              return;
 +
+       case CPUID_THERM_POWER_LEAF:
+               /* Disabling APERFMPERF for kernel usage */
+               maskecx = ~(1 << APERFMPERF_PRESENT);
+               break;
+ 
        case 0xb:
                /* Suppress extended topology stuff */
                maskebx = 0;

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/usb/serial/option.c
Simple merge

diff --cc include/linux/pci.h
index 9a11459208f1f8b03885b282bb528398ae872dbd,ff5970b7a176f213a6564c25ae337c921037491c..92b9d08950a43fbe0f79edf217e714da2b6dcc40
--- 1/include/linux/pci.h
--- 2/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -174,8 -174,8 +174,10 @@@ enum pci_dev_flags 
        PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG = (__force pci_dev_flags_t) 1,
        /* Device configuration is irrevocably lost if disabled into D3 */
        PCI_DEV_FLAGS_NO_D3 = (__force pci_dev_flags_t) 2,
 +      /* Provide indication device is assigned by a Virtual Machine Manager */
 +      PCI_DEV_FLAGS_ASSIGNED = (__force pci_dev_flags_t) 4,
+       /* Device causes system crash if in D3 during S3 sleep */
+       PCI_DEV_FLAGS_NO_D3_DURING_SLEEP = (__force pci_dev_flags_t) 8,
  };
  
  enum pci_irq_reroute_variant {