summaryrefslogtreecommitdiffstats
path: root/include/linux/timerqueue.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-03-22 12:57:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-22 12:57:30 -0700
commitb9cb3bf42efc2faa55e815f4368738978536c6d1 (patch)
treed17b9aa7132313423d9c1d53695bbeead35fa00e /include/linux/timerqueue.h
parent8f46c507a2245697d6b3af75552c76d2f4fb3ed2 (diff)
parent09a6e1f4ad32243989b30485f78985c0923284cd (diff)
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fix from Marcelo Tosatti: "Fix compilation on PPC with !CONFIG_KVM" * git://git.kernel.org/pub/scm/virt/kvm/kvm: Revert "KVM: allow host header to be included even for !CONFIG_KVM"
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions