diff options
| author | Arnd Bergmann <[email protected]> | 2013-06-20 16:51:39 +0200 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2013-06-20 16:51:39 +0200 |
| commit | dc30f7c3acc486572dfa7dbd70aa955a56066c66 (patch) | |
| tree | 855ef889b671b3c8d5aa6aea3aa8c655d2d50a3a /arch/arm/include/asm/psci.h | |
| parent | 3c373f9983f5531c10c29ae1e3136371c8949140 (diff) | |
| parent | db3824e6bf0b0f421b0d43f08d905935e826a965 (diff) | |
Merge tag 'samsung-cleanup-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
From Kukjin Kim:
- Consolidate uncompress subroutines and s5p64x0-uncompress
- Cleanup watchdog support on Samsung to support multiplatform
* tag 'samsung-cleanup-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: Remove unused plat/regs-watchdog.h header
ARM: SAMSUNG: Remove legacy watchdog reset code
ARM: SAMSUNG: Let platforms use the new watchdog reset driver
ARM: SAMSUNG: Add watchdog reset driver
ARM: SAMSUNG: Use local definitions of watchdog registers
watchdog: s3c2410_wdt: Use local register definitions
ARM: S5P64X0: Use common uncompress.h part for plat-samsung
ARM: SAMSUNG: Consolidate uncompress subroutine
Signed-off-by: Arnd Bergmann <[email protected]>
Diffstat (limited to 'arch/arm/include/asm/psci.h')
0 files changed, 0 insertions, 0 deletions