diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-04 20:55:46 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-04 20:55:55 +0000 |
commit | d405e4b07a15b9d24d504a459295cf00a618c10c (patch) | |
tree | e92b60b51487b53399d89552a2ec514a9d5b021c /drivers/infiniband/hw/nes/nes_context.h | |
parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) | |
parent | e186ad74c0941f5caeda28bde76dab903b342c1c (diff) | |
download | linux-d405e4b07a15b9d24d504a459295cf00a618c10c.tar.gz linux-d405e4b07a15b9d24d504a459295cf00a618c10c.tar.bz2 linux-d405e4b07a15b9d24d504a459295cf00a618c10c.zip |
Merge tag 'tegra-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/soc
From: Olof Johansson <olof@lixom.net>
SoC new development for tegra SoCs, mostly tegra30 core support.
It also includes one stray bugfix that was misapplied (should have been
in soc-drivers), but it went out to the stable branches before I noticed
so I've left it in.
* tag 'tegra-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:
ARM: tegra: Demote EMC clock inconsistency BUG to WARN
ARM: tegra: Avoid compiling cpuidle code when not configured
ARM: tegra: cpuidle driver for tegra
ARM: tegra: assembler code for LP3
ARM: tegra: definitions for flow controller
ARM: tegra: initialize basic system clocks
ARM: tegra: enable tegra30 clock framework
ARM: tegra: implement basic tegra30 clock framework
ARM: tegra: add support for new clock framework features
ARM: tegra: add support for tegra30 interrupts
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_context.h')
0 files changed, 0 insertions, 0 deletions