diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-04 21:55:46 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-04 21:57:06 +0100 |
| commit | c71656c018c8551eca45b2f873b239f0303d74cb (patch) | |
| tree | bab4825a6ed993c98ac4967f2aa976536f58568a /fs/ntfs/attrib.c | |
| parent | Merge branch 'features/imx3' of git://git.pengutronix.de/git/imx/linux-2.6 in... (diff) | |
| parent | ARM: tegra: Demote EMC clock inconsistency BUG to WARN (diff) | |
| download | linux-c71656c018c8551eca45b2f873b239f0303d74cb.tar.xz linux-c71656c018c8551eca45b2f873b239f0303d74cb.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 'fs/ntfs/attrib.c')
0 files changed, 0 insertions, 0 deletions