| commit | 684baeb1d78ac478a8e5f00aa9ab0ce0837f2a91 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 24 04:07:02 2012 +0300 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 24 04:07:02 2012 +0300 |
| tree | 47df6b59ab2f7d13516127726b99edc985bf4e12 | |
| parent | 4e3ab74c22425e73a0c11dcc065c94c5c75ed2ad [diff] | |
| parent | fd0587339d80dd2fea5ead7f734676c9c618eace [diff] |
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