From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 21 Aug 2016 21:28:24 +0000 (-0700)
Subject: Merge branch 'parisc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=46097f27180c7dd371c2b0391d40bb1fa36007af;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'parisc-4.8-2' of git://git./linux/kernel/git/deller/parisc-linux

Pull two parisc fixes from Helge Deller:
 "The first patch ensures that the high-res cr16 clocksource (which was
  added in kernel 4.7) gets choosen as default clocksource for parisc.

  The second patch moves the #define of EREFUSED down inside errno.h and
  thus unbreaks building the gccgo compiler"

* 'parisc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix order of EREFUSED define in errno.h
  parisc: Fix automatic selection of cr16 clocksource
---

46097f27180c7dd371c2b0391d40bb1fa36007af