]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'samsung-cleanup-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 14:51:39 +0000 (16:51 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 14:51:39 +0000 (16:51 +0200)
commit4d1525949626ad051820c235227a49af5e2a58cb
tree855ef889b671b3c8d5aa6aea3aa8c655d2d50a3a
parent7d79585ea2852c4c63059ece8214f8fd5e1153e9
parent60e981e31c7b83b7a23ca3b03f7537e9d276b538
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 <arnd@arndb.de>