summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra
diff options
context:
space:
mode:
authorArnd Bergmann2012-03-02 16:04:47 +0100
committerArnd Bergmann2012-03-02 16:04:47 +0100
commitcb66bb1d6fab2d91960c20f256c6986d5afac1a1 (patch)
tree08bec33c473e85de9478b68cb1f3fbc1e6ebef07 /arch/arm/mach-tegra
parentMerge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/li... (diff)
parentARM: mx3: Setup AIPS registers (diff)
downloadkernel-qcow2-linux-cb66bb1d6fab2d91960c20f256c6986d5afac1a1.tar.gz
kernel-qcow2-linux-cb66bb1d6fab2d91960c20f256c6986d5afac1a1.tar.xz
kernel-qcow2-linux-cb66bb1d6fab2d91960c20f256c6986d5afac1a1.zip
Merge branch 'features/imx3' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
* 'features/imx3' of git://git.pengutronix.de/git/imx/linux-2.6: ARM: mx3: Setup AIPS registers ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFI Conflicts: arch/arm/mach-imx/mm-imx3.c
Diffstat (limited to 'arch/arm/mach-tegra')
0 files changed, 0 insertions, 0 deletions