Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux...
authorOlof Johansson <olof@lixom.net>
Tue, 5 Feb 2013 18:26:06 +0000 (10:26 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 5 Feb 2013 18:26:20 +0000 (10:26 -0800)
commitb28eaacfbbccef527834d48f118919b39ec8d213
treeacaa997a97f2f739d11c0030b204041b21ce7107
parent0a046de1d103ebb02f64c61eb30800e39e9c8ec9
parent1ff5f55a8c7b011f818434923a93afc48de0b2ee
Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

From Shawn Guo:
The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which
are unused on ARM architecure.  Samsung has some code setting up wdog
in arch_decomp_wdog().  But since CONFIG_S3C_BOOT_WATCHDOG is defined
nowhere, it will not run.  Otherwise, system can not boot at all when
wdog is set up but no one pats it.

* tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: samsung: remove unused arch_decomp_wdog() code
  ARM: remove unused arch_decomp_wdog()
  ARM: decompress: remove unused ARCH_HAS_DECOMP_WDOG

Signed-off-by: Olof Johansson <olof@lixom.net>