Merge pull request #1 from 173210/4.4.2_dlxj

dlxj: ConsumerIR support
Revert Makefile
Update defconfig
Revert screen resolution in synaptics platform data

Conflicts:
	arch/arm/mach-msm/board-deluxe_j.c
Apply kexec_hardboot patch
Enable SERIAL_CIR which should have been enabled
dlxj: Fix CIR problem that prevents devices of later revision from booting
dlxj: fix for FeliCa
dlxj: enable MMC_CPRM_SUPPORT