summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-24 03:07:02 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-24 03:07:02 +0200
commit684baeb1d78ac478a8e5f00aa9ab0ce0837f2a91 (patch)
tree47df6b59ab2f7d13516127726b99edc985bf4e12 /kernel
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff)
parentDocumentation: Reflect the new location of the NMI watchdog info (diff)
downloadlinux-684baeb1d78ac478a8e5f00aa9ab0ce0837f2a91.tar.xz
linux-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 'kernel')
0 files changed, 0 insertions, 0 deletions