git.baikalelectronics.ru Git - kernel.git/commit

Merge tag 'renesas-sh-drivers-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

Pull SH driver fix from Simon Horman:
"Compile drivers/sh/pm_runtime.c if ARCH_SHMOBILE_MULTI

  This resolves a regression introduced in v3.14 by commit cc32239ec44e
  ("ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY")"

* tag 'renesas-sh-drivers-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  drivers: sh: compile drivers/sh/pm_runtime.c if ARCH_SHMOBILE_MULTI

author	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 21 May 2014 19:26:23 +0000 (04:26 +0900)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 21 May 2014 19:26:23 +0000 (04:26 +0900)
commit	15927d07469d90c1f68fb599218b16f79844c668
tree	7fe520396f9a926769a10868eeb9340494a17053	tree \| snapshot
parent	419a9346387238873fd9e69c819649a2befa7159	commit \| diff
parent	68767564c236c073502b45caf4418a54b39bdc92	commit \| diff