Merge tag 'renesas-sh-drivers-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jun 2014 18:44:09 +0000 (11:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jun 2014 18:44:09 +0000 (11:44 -0700)
commit75bcc84445bccf40a6215ff6fc6dd91978b1490e
tree1f2cb11a503ce3ae4d4c7ef6ffe9ac5f32536b50
parentcc07aabc53978ae09a1d539237189f7c9841060a
parent2f35fb3c8a6018a0a5fe4a7fb0948b853c157256
Merge tag 'renesas-sh-drivers-for-v3.16' of git://git./linux/kernel/git/horms/renesas into next

Pull SH driver update from Simon Horman:

 - PM Runtime enhancements targeted for use with ARM-based Renesas R-Car
   Gen2 SoCs

 - Restrict INTC_USERIMASK to SH4A as it is only used there

* tag 'renesas-sh-drivers-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  drivers: sh: Enable PM runtime for new R-Car Gen2 SoCs
  drivers: sh: pm_runtime implementation needs to suspend and resume devices
  drivers: sh: Restrict INTC_USERIMASK to SH4A
  drivers: sh: pm_runtime does not need idle callback