mach-msm: board-m7wl-display.c fix merge derp

Signed-off-by: Bryan Smith <zarboz@gmail.com>
update gitignore

Signed-off-by: Bryan Smith <zarboz@gmail.com>