Merge tag 'sh-fixes-4.6-rc1' of git://git.libc.org/linux-sh
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Apr 2016 20:02:06 +0000 (13:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Apr 2016 20:02:06 +0000 (13:02 -0700)
commit90de6800c240dfe089e254116a7c055e70b709fd
tree7ceca78ebcc056291a92fe3a8be010a2dcf5fc63
parent5b523ff281b9f97ec75d526e2750381c6e8c9326
parentccc7d5a1cdae78ccd623540dc87e281135a1c053
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