Linus Torvalds cd9a0b6bd6 Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc ... * 'next/pm' of git://git.linaro.org/people/arnd/arm-soc: (66 commits) ARM: CSR: PM: use outer_resume to resume L2 cache ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII ARM: OMAP: voltage: voltage layer present, even when CONFIG_PM=n ARM: CSR: PM: add sleep entry for SiRFprimaII ARM: CSR: PM: save/restore irq status in suspend cycle ARM: CSR: PM: save/restore timer status in suspend cycle OMAP4: PM: TWL6030: add cmd register OMAP4: PM: TWL6030: fix ON/RET/OFF voltages OMAP4: PM: TWL6030: address 0V conversions OMAP4: PM: TWL6030: fix uv to voltage for >0x39 OMAP4: PM: TWL6030: fix voltage conversion formula omap: voltage: add a stub header file for external/regulator use OMAP2+: VC: more registers are per-channel starting with OMAP5 OMAP3+: voltage: update nominal voltage in voltdm_scale() not VC post-scale OMAP3+: voltage: rename omap_voltage_get_nom_volt -> voltdm_get_voltage OMAP3+: voltdm: final removal of omap_vdd_info OMAP3+: voltage: move/rename curr_volt from vdd_info into struct voltagedomain OMAP3+: voltage: rename scale and reset functions using voltdm_ prefix OMAP3+: VP: combine setting init voltage into common function OMAP3+: VP: remove unused omap_vp_get_curr_volt() ... Fix up trivial conflict in arch/arm/mach-prima2/l2x0.c (code removal vs edit)		2011-11-01 20:22:01 -07:00
..
include/mach	ARM: mach-prima2: remove mach/memory.h	2011-10-13 12:49:50 -04:00
clock.c	ARM: CSR: clock: Fix indentation	2011-10-01 09:40:44 +08:00
common.h	ARM: CSR: mapping early DEBUG_LL uart	2011-07-09 07:20:51 +08:00
irq.c	ARM: CSR: PM: save/restore irq status in suspend cycle	2011-09-21 22:52:58 +08:00
l2x0.c	ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII	2011-10-24 02:54:21 -07:00
lluart.c	ARM: CSR: mapping early DEBUG_LL uart	2011-07-09 07:20:51 +08:00
Makefile	ARM: CSR: PM: add sleep entry for SiRFprimaII	2011-09-21 23:25:59 +08:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
pm.c	ARM: CSR: PM: use outer_resume to resume L2 cache	2011-10-24 02:55:28 -07:00
pm.h	ARM: CSR: PM: add sleep entry for SiRFprimaII	2011-09-21 23:25:59 +08:00
prima2.c	Merge branch 'next/fixes' into next/cleanup	2011-10-31 23:25:41 +01:00
rstc.c	ARM: CSR: add missing sentinels to of_device_id tables	2011-09-11 09:11:26 +08:00
rtciobrg.c	ARM: CSR: add rtc i/o bridge interface for SiRFprimaII	2011-09-11 09:17:53 +08:00
sleep.S	ARM: CSR: PM: add sleep entry for SiRFprimaII	2011-09-21 23:25:59 +08:00
timer.c	Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:22:01 -07:00