Merge in MJ5 wifi driver
video:msm: Better error detection/logging
mDNIE: Fix Samsung typos for typedefs on mode and scenario names

Conflicts:

	drivers/video/msm/mdnie_lite_tuning.h
drivers:video: Added some MJ5 code plus sync with firmware files for MJ5
jflteatt: conform to the rest of jf devices

* fixes build issues with our consolidated defconfig

Change-Id: I514385e7ca3f1cbd884f7fc15c4426575da29fb0
jf: clean up and consolidate defconfigs

* regenerate commonized defconfig
* clean up the mess

Change-Id: I6895d70d3256d0d0337373919ed9f29658f30e86

Conflicts:
	arch/arm/configs/cyanogen_jf_defconfig

Conflicts:

	arch/arm/configs/cyanogen_jf_defconfig
Revert "kernel/workqueue.c: fix merge"

This reverts commit cb7e014c8609b5f067a224aa1b07a43241d26978.
Revert "workqueue: consider work function when searching for busy work items"

This reverts commit e1159eba2e2d9c465b74212455023c69f104a8aa.