From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 11 Nov 2018 22:14:05 +0000 (-0600)
Subject: Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.20-rc2~10
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0b002cdd5004c0205364b3be2cfa6aed05c61f42;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull core fixes from Thomas Gleixner:
 "A couple of fixlets for the core:

   - Kernel doc function documentation fixes

   - Missing prototypes for weak watchdog functions"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  resource/docs: Complete kernel-doc style function documentation
  watchdog/core: Add missing prototypes for weak functions
  resource/docs: Fix new kernel-doc warnings
---

0b002cdd5004c0205364b3be2cfa6aed05c61f42