Fix Makefile merge issue.
Fix Makefile merge issue.

yossigo/redis,oranagra/redis,yossigo/redis,soveran/redis,PKRoma/redis,charsyam/redis,pmem/redis,ofirluzon/redis,PKRoma/redis,ofirluzon/redis,neomantra/redis,PKRoma/redis,ofirluzon/redis,yossigo/redis,antirez/redis,pmem/redis,charsyam/redis,oranagra/redis,soloestoy/redis,ctripcorp/redis,ofirluzon/redis,PKRoma/redis,soveran/redis,antirez/redis,ctripcorp/redis,antirez/redis,soloestoy/redis,pmem/redis,neomantra/redis,charsyam/redis,ctripcorp/redis,yossigo/redis,neomantra/redis,charsyam/redis,antirez/redis,soloestoy/redis,ofirluzon/redis,soloestoy/redis,ctripcorp/redis,oranagra/redis,soveran/redis,neomantra/redis,pmem/redis,soveran/redis,charsyam/redis,yossigo/redis,oranagra/redis,oranagra/redis,soloestoy/redis,PKRoma/redis,neomantra/redis