tree 79211d70db535cfb838f3e79d31dd2ceaf6d22c1
parent 5993fe31c0e9646233ff4ecea32e3c899036eda9
parent ee73f656a604d5aa9df86a97102e4e462dd79924
author Linus Torvalds <torvalds@linux-foundation.org> 1265815095 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1265815095 -0800

Merge branch 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm

* 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: PIT: control word is write-only
  kvmclock: count total_sleep_time when updating guest clock
  Export the symbol of getboottime and mmonotonic_to_bootbased