diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 11:39:47 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 11:39:47 -0500 |
commit | ef7848683f4de4903376638b69e6b4ac729b3ead (patch) | |
tree | cd7b8848149a0d2b71fcce27b071bbff086b32fb /net/ipv4/ip_vti.c | |
parent | 6b2aa055488af2048d4e991c0e1754c24b1b30f5 (diff) | |
parent | 74d29168e9af59c9db1885e27493fbed4d24ef18 (diff) |
Merge tag 'omap-for-v3.8/pm-part2-v3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm
From Tony Lindgren <tony@atomide.com>:
PM changes via Kevin Hilman <khilman@deeprootsystems.com>:
Add support for full-chip retention in suspend for OMAP4 SoCs
* tag 'omap-for-v3.8/pm-part2-v3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: voltage: fixup oscillator handling when CONFIG_PM=n
ARM: OMAP4: USB: power down MUSB PHY during boot
ARM: OMAP4: suspend: Program all domains to retention
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/ipv4/ip_vti.c')
0 files changed, 0 insertions, 0 deletions