mm : Repair conflicted elements

Signed-off-by: Muhammad Najmi Ahmad Zabidi <najmi.zabidi@gmail.com>
build file for Linux 3.4.81

Signed-off-by: Muhammad Najmi Ahmad Zabidi <najmi.zabidi@gmail.com>