Merge branch 'master' into for-next
[profile/ivi/kernel-x86-ivi.git] / tools / virtio / linux / hrtimer.h