From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 31 Dec 2013 12:41:08 +0000 (+0100)
Subject: Merge branch 'acpi-pci-hotplug' into acpi-hotplug
X-Git-Tag: v3.14-rc1~107^2~11^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d1badf8d4323cfc9325b06651bdfcf7df09f1f0e;p=linux.git

Merge branch 'acpi-pci-hotplug' into acpi-hotplug

Conflicts:
	include/acpi/acpi_bus.h
---

d1badf8d4323cfc9325b06651bdfcf7df09f1f0e
diff --cc include/acpi/acpi_bus.h
index 48d302501539,ca49ebd231ca..e4ab7be65637
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@@ -161,9 -168,8 +161,10 @@@ struct acpi_device_flags 
  	u32 ejectable:1;
  	u32 power_manageable:1;
  	u32 match_driver:1;
 +	u32 initialized:1;
 +	u32 visited:1;
- 	u32 reserved:25;
+ 	u32 no_hotplug:1;
 -	u32 reserved:26;
++	u32 reserved:24;
  };
  
  /* File System */