Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Oct 2012 01:07:02 +0000 (04:07 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Oct 2012 01:07:02 +0000 (04:07 +0300)
commit684baeb1d78ac478a8e5f00aa9ab0ce0837f2a91
tree47df6b59ab2f7d13516127726b99edc985bf4e12
parent4e3ab74c22425e73a0c11dcc065c94c5c75ed2ad
parentfd0587339d80dd2fea5ead7f734676c9c618eace
Merge branch 'core-urgent-for-linus' of git://git./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
Documentation/00-INDEX