Merge "ARM: 7670/1: fix the memset fix"