dlxj: Fix CIR problem that prevents devices of later revision from booting
dlxj: fix for FeliCa

Conflicts:
	drivers/felica/felica_cxd2235.c
	include/linux/felica_cxd2235.h

Change-Id: Ic52f756ea82b1000baff28b1d380b15e7a732ce2
dlxj: enable MMC_CPRM_SUPPORT
Merge branch 'cm-11.0' of git://github.com/kbc-developers/android_kernel_htc_m7wlj into cm-11.0