diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2012-03-02 15:04:47 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-02 15:04:47 +0000 |
| commit | cb66bb1d6fab2d91960c20f256c6986d5afac1a1 (patch) | |
| tree | 08bec33c473e85de9478b68cb1f3fbc1e6ebef07 /include/linux/timerqueue.h | |
| parent | Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc (diff) | |
| parent | ARM: mx3: Setup AIPS registers (diff) | |
Merge branch 'features/imx3' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
* 'features/imx3' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: mx3: Setup AIPS registers
ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFI
Conflicts:
arch/arm/mach-imx/mm-imx3.c
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions