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)
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>

Trivial merge