Merge tag 'kvm_mips_4.9_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan...
authorRadim Krčmář <rkrcmar@redhat.com>
Thu, 20 Oct 2016 15:26:53 +0000 (17:26 +0200)
committerRadim Krčmář <rkrcmar@redhat.com>
Thu, 20 Oct 2016 15:26:53 +0000 (17:26 +0200)
commitf6bbf1b7ac1fba284df82d7344080a8e7435b023
tree6842cd48e7ed245f0db94b6d8aefa288753d0f32
parent8678654e3c7ad7b0f4beb03fa89691279cba71f9
parentd852b5f35e84e60c930589eeb14a6df21ea9b1cb
Merge tag 'kvm_mips_4.9_2' of git://git./linux/kernel/git/jhogan/kvm-mips

MIPS KVM fix for v4.9-rc2

- Fix build error introduced during the 4.9 merge window when
  tracepoints are disabled.