Merge branch 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas...
authorArnd Bergmann <arnd@arndb.de>
Mon, 12 Nov 2012 21:12:35 +0000 (22:12 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 12 Nov 2012 21:12:35 +0000 (22:12 +0100)
commitf29246524284a78457f0fbf74a5b50327d4f3aca
tree999cf735f9b24f7d12f47b9de97c1ddade8b3e5e
parent889cf721d7f9249542315599032accffea3b9288
parentd5b689089d7db3851c4d5d6b3727d22ef44d2023
Merge branch 'soc2' of git://git./linux/kernel/git/horms/renesas into next/soc2

From Simon Horman <horms@verge.net.au>:
* This pull-request is based on the boards branch of the rensas tree
  which I have sent a pull-request for. The boards branch is in
  turn based on the soc branch. The reason for the soc2 -> boards -> soc
  branch progression is to satisfy dependencies of patches in
  the boards and soc branches.

* 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
  ARM: shmobile: sh7372: remove fsidivx clock

Signed-off-by: Arnd Bergmann <arnd@arndb.de>