From: Arnd Bergmann Date: Thu, 20 Jun 2013 14:51:39 +0000 (+0200) Subject: Merge tag 'samsung-cleanup-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=dc30f7c3acc486572dfa7dbd70aa955a56066c66;p=openwrt%2Fstaging%2Fblogic.git Merge tag 'samsung-cleanup-1' of git://git./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 --- dc30f7c3acc486572dfa7dbd70aa955a56066c66