summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/mach-mx31_3ds.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-11-12 21:45:19 +0100
committerArnd Bergmann <arnd@arndb.de>2012-11-12 21:45:19 +0100
commit1bf0bc1e050fc425cc776b10d3ce8754389aabbe (patch)
tree317dceabcdd661bebfb829c4ba4440dc2ae2adf2 /arch/arm/mach-imx/mach-mx31_3ds.c
parentb68c50d836517cf662145b2e7d5cdf40a38b24f1 (diff)
parent2944628607f76e4755660cd710f22a4748ef88d8 (diff)
downloadlinux-3.10-1bf0bc1e050fc425cc776b10d3ce8754389aabbe.tar.gz
linux-3.10-1bf0bc1e050fc425cc776b10d3ce8754389aabbe.tar.bz2
linux-3.10-1bf0bc1e050fc425cc776b10d3ce8754389aabbe.zip
Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
From Simon Horman <horms@verge.net.au>: This series is based on the renesas/soc branch of the arm-soc tree. There will be a subquent 'SoC2' pull request which is based on this pull-request and a pull-request for boards. * 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: add fsi external clock sh7372 ARM: shmobile: add fsi external clock on r8a7740 ARM: shmobile: r8a7740: add FSI-DVI clocks ARM: shmobile: sh7372: use sh_clk_fsidiv_register() for FSI-DIV clocks ARM: shmobile: sh7372: sh7372_fsidivX_clk become non-global sh: clkfwk: add sh_clk_fsidiv_register() ARM: shmobile: r8a7779: add USB OHCI clock support ARM: shmobile: r8a7779: add USB EHCI clock support ARM: shmobile: r8a7740: add USB24 clock explain ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31_3ds.c')
0 files changed, 0 insertions, 0 deletions