diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-24 04:07:02 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-24 04:07:02 +0300 |
| commit | 684baeb1d78ac478a8e5f00aa9ab0ce0837f2a91 (patch) | |
| tree | 47df6b59ab2f7d13516127726b99edc985bf4e12 /virt/kvm/kvm_main.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux (diff) | |
| parent | Documentation: Reflect the new location of the NMI watchdog info (diff) | |
| download | linux-dev-684baeb1d78ac478a8e5f00aa9ab0ce0837f2a91.tar.xz linux-dev-684baeb1d78ac478a8e5f00aa9ab0ce0837f2a91.zip | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core kernel fixes from Ingo Molnar:
"Two small fixes"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Documentation: Reflect the new location of the NMI watchdog info
nohz: Fix idle ticks in cpu summary line of /proc/stat
Diffstat (limited to 'virt/kvm/kvm_main.c')
0 files changed, 0 insertions, 0 deletions