From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Apr 2016 20:02:06 +0000 (-0700)
Subject: Merge tag 'sh-fixes-4.6-rc1' of git://git.libc.org/linux-sh
X-Git-Tag: v4.14-rc1~3444
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90de6800c240dfe089e254116a7c055e70b709fd;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'sh-fixes-4.6-rc1' of git://git.libc.org/linux-sh

Pull arch/sh fixes from Rich Felker:
 "Fixes for two arch/sh build regressions that appeared in 4.6-rc1, one
  introduced by me, and one caused by changes elsewhere"

* tag 'sh-fixes-4.6-rc1' of git://git.libc.org/linux-sh:
  sh: fix function signature of cpu_coregroup_mask to match pointer type
  sh: fix smp-shx3 build regression from removal of arch localtimer
---

90de6800c240dfe089e254116a7c055e70b709fd