aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/scripts/python
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-06-07 11:43:23 -0700
committerOlof Johansson <olof@lixom.net>2012-06-07 11:47:28 -0700
commit97114f3982630d35a8a6367244f185a1c3277ad5 (patch)
treea166bc430c63c63becf351a3fe9f8af5d9305ebb /tools/perf/scripts/python
parentLinux 3.5-rc1 (diff)
parentARM: imx6q: prepare and enable init on clks directly instead of clk_get first (diff)
downloadlinux-dev-97114f3982630d35a8a6367244f185a1c3277ad5.tar.xz
linux-dev-97114f3982630d35a8a6367244f185a1c3277ad5.zip
Merge tag 'imx-clk-common-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
From Sascha Hauer: "Some fixes for the fresh i.MX common clock support" Resolved trivial conflict in arch/arm/plat-mxc/include/mach/common.h. * tag 'imx-clk-common-fixes' of git://git.pengutronix.de/git/imx/linux-2.6: ARM: imx6q: prepare and enable init on clks directly instead of clk_get first ARM i.MX: remove now unnecessary argument from mxc_timer_init ARM: i.MX: change timer clock from ipg to perclk ARM i.MX5: fix gpt peripheral clock path Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions