Mark this release to be acpi v6.0.0, resolve merge conflict

Author: IsaacWoods

Cargo.toml

@@ -4,7 +4,7 @@ resolver = "2"
 
 [package]
 name = "acpi"
-version = "5.1.0"
+version = "6.0.0"
 authors = ["Isaac Woods"]
 repository = "https://github.com/rust-osdev/acpi"
 description = "A pure-Rust library for interacting with ACPI"