diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-19 21:04:42 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-19 21:04:42 -0800 |
| commit | b86c7842ef176df0fef3d3d05f83900b3599223d (patch) | |
| tree | cff90b5421967f17d11a7611a9c5f0fca0be4d67 /net/key | |
| parent | 05da34d832d404ac9094db57e9295000207c9d62 (diff) | |
| parent | fe5d3e887e3f9d0a97e5b8df968ab84a12128495 (diff) | |
Merge branch 'omap/prcm' into next/pm
* omap/prcm:
ARM: OMAP2+: hwmod: Add a new flag to handle hwmods left enabled at init
ARM: OMAP4: PRM: use PRCM interrupt handler
ARM: OMAP3: pm: use prcm chain handler
ARM: OMAP: hwmod: add support for selecting mpu_irq for each wakeup pad
ARM: OMAP2+: mux: add support for PAD wakeup interrupts
ARM: OMAP: PRCM: add suspend prepare / finish support
ARM: OMAP: PRCM: add support for chain interrupt handler
ARM: OMAP3/4: PRM: add functions to read pending IRQs, PRM barrier
ARM: OMAP2+: hwmod: Add API to enable IO ring wakeup
ARM: OMAP2+: mux: add wakeup-capable hwmod mux entries to dynamic list
Diffstat (limited to 'net/key')
0 files changed, 0 insertions, 0 deletions