Merge makefile with 3.4.5 kernel