Merge lp:~dannf/ubuntu/trusty/cpu-checker/arm64 into lp:ubuntu/trusty/cpu-checker

[dann frazier]

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-18 13:53:45 +0000
+++ debian/changelog	2014-02-20 00:56:00 +0000
@@ -1,3 +1,9 @@
+cpu-checker (0.7-0ubuntu4) UNRELEASED; urgency=medium
+
+  * Add support for arm64
+
+ -- dann frazier <[e-mail]>  Wed, 19 Feb 2014 17:42:24 -0700
+
 cpu-checker (0.7-0ubuntu3) saucy; urgency=low
 
   * d/p/arm: add support for ARM Cortex-A15 systems (LP: #1194632). Thanks to
 
=== modified file 'debian/control'
--- debian/control	2013-09-18 13:53:45 +0000
+++ debian/control	2014-02-20 00:56:00 +0000
@@ -9,7 +9,7 @@
 Vcs-Bzr: lp:~cpu-checker-dev/cpu-checker/trunk
 
 Package: cpu-checker
-Architecture: amd64 armhf i386
+Architecture: amd64 arm64 armhf i386
 Depends: msr-tools [amd64 i386], ${shlibs:Depends}, ${misc:Depends}
 Conflicts: qemu-kvm (<< 0.12.3-0ubuntu13)
 Replaces: qemu-kvm (<< 0.12.3-0ubuntu13)
 
=== modified file 'kvm-ok'
--- kvm-ok	2013-09-18 13:53:45 +0000
+++ kvm-ok	2014-02-20 00:56:00 +0000
@@ -48,6 +48,9 @@
 	virt="ARM"
 	kvm_mod="kvm"
     fi
+elif [ "$(uname -m)" = "aarch64" ]; then
+	virt="ARM"
+	kvm_mod="kvm"
 else
     virt=$(egrep -m1 -w '^flags[[:blank:]]*:' /proc/cpuinfo | egrep -wo '(vmx|svm)') || true
     [ "$virt" = "vmx" ] && kvm_mod="kvm_intel"