Merge hermit-os#166

166: clearify license text, add workround to use raw-cpuid r=stlankes a=stlankes

The workaround should solve issue hermit-os#164 and is only necessry until gz/rust-x86#71 is accepted.

Co-authored-by: Stefan Lankes <slankes@eonerc.rwth-aachen.de>

Cargo.toml

@@ -6,7 +6,7 @@ authors = [
 	"Colin Finck <colin.finck@rwth-aachen.de>"
 ]
 build = "build.rs"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 readme = "README.md"
 keywords = ["unikernel", "libos"]
 categories = ["os"]
@@ -44,7 +44,7 @@ smp = []
 fsgsbase = []
 
 [dev-dependencies]
-x86 = { version = "0.35.*", default-features = false }
+x86 = { version = "0.36.*", default-features = false }
 float-cmp = "0.8.0"
 
 [dependencies.scopeguard]
@@ -80,7 +80,7 @@ default-features = false
 version = "0.6.*"
 
 [target.'cfg(target_arch = "x86_64")'.dependencies.x86]
-version = "0.35.*"
+version = "0.36.*"
 default-features = false
 
 # The development profile, used for `cargo build`.