Fix conflict.
u damn intelliplug
Revert "FIX: Voltage Control got messed up."

This reverts commit dbf02b0a310cb8f0c0e1a9d4dce6e467012006b7.
Revert "Added Custom Voltage version 3."

This reverts commit 67c63d277b6052ad5b00f0d4d2d1a31719645b44.
Revert " ARM: 7670/1: fix the memset fix"

This reverts commit aab5acf3e8a83da9201c61b45dfca412aa384001.
Revert "ARM: 7668/1: fix memset-related crashes caused by recent GCC (4.7.2) …"

This reverts commit 36922fe89e76821720a0177262ed76a8dd85c42c.