change common_edify_generator to pass update.zip flashing
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
omap4-common: switch wpa_supplicant back to the normal version

this is needed to fix wifi instability and high power-usage
caused by a change to the wpa_supplicant_lib.

Change-Id: Ia4f12fd36f22e4266ef68141f6d18e1fe333a432
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
omap4-common: add edison module for audio-HAL wrapper
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
omap4-common: moto_audio_wrapper: fix set_mode for ICS blob

Change-Id: Iee07478f9121dc0ca17f00c78fd95fb6a947fa93
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
omap4-common: camera: libexif was renamed to libjhead in 4.4.3

Change-Id: Ifd06b3fa6d57a748d776ccef9574094149733473
camera: allow building for any 4.4.x version

Change-Id: I2df835d6e4e8c2d04db1b0a8d340c6643f1cc9c5
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0