diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-10 07:18:15 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-10 07:18:15 -0800 |
commit | 2cbd1883881ac490d93514324b947a0267c5ca96 (patch) | |
tree | 79211d70db535cfb838f3e79d31dd2ceaf6d22c1 /kernel/seccomp.c | |
parent | 5993fe31c0e9646233ff4ecea32e3c899036eda9 (diff) | |
parent | ee73f656a604d5aa9df86a97102e4e462dd79924 (diff) | |
download | linux-2cbd1883881ac490d93514324b947a0267c5ca96.tar.gz linux-2cbd1883881ac490d93514324b947a0267c5ca96.tar.bz2 linux-2cbd1883881ac490d93514324b947a0267c5ca96.zip |
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
Diffstat (limited to 'kernel/seccomp.c')
0 files changed, 0 insertions, 0 deletions