Fix build for Aries
 There is no need for a ifeq for herring here. It was necessary
ifneq to exclude it, but now since it has  s5pc110 flag that is enough.

Change-Id: Ief0377ef9f5eb437cb229c351e53c6e0e13bbec6
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
macloader: Add another murata MAC

Reported by users at:
http://forum.xda-developers.com/showthread.php?t=2549112

Change-Id: I7f37adb67012baf8f3685773de9145fd0850fd20
Merge "macloader: Add another murata MAC" into kk4.4
macloader: Added another SEMCOSH mac

Change-Id: Ie86df2ae06e6646bd29362d0cc22fb6fd14aeb67
exynos3: libs3cjpeg: read memory configuration from kernel

This improves the flexibility (not all devices have the same FFC
resolution) and also allows optimization of memory usage.

We currently allocate 4 MB to the hardware JPEG encoder, but only
1 MB is actually needed if it's only used for encoding VGA images.
Note that the thumbnail encoding function of the kernel driver is
not used.

This patch is backward compatible with older kernels, but patching
is recommended. Cherry-pick the following commits:

	http://review.cyanogenmod.org/56791
	http://review.cyanogenmod.org/56792

Change-Id: I0e89b24e56b99e8e27f5a38d5c158b23021ed035
Added more MAC's for murata.

After finding some i9300 devices who's MAC addresses were missing from the list, i searched for all murata MAC's and thought it wise to add them.

Change-Id: I9e0db81cf2b1809b37b1660a4763db82699dd452
mfcdec: Compensate race condition in video thumbnail generation

Calling the decoder immediately after encoding a video often
trips on the ongoing mfc buffer flushes from the encoder that has
just shut down, and fails due to the unavailability of any buffer of
sufficient size. If MFC_DEC_INIT fails, give it 100msec and try
again. This resolves the blank thumbs when switching to the
gallery in the same session that a recording was made.

Change-Id: I13b1be8757b314e1c903a0570f9b053550164616
Merge "exynos3: libs3cjpeg: read memory configuration from kernel" into kk4.4
Fix crash on boot

There is a race condition where the sysfs-vsync thread accesses a value
(in particular a function ptr) that may not have been set yet as this
is done externally.

Change-Id: If1afb1533344e994398b9b6f5bd3dfb125313416
xmm626x: Update libril to v9 [1/2]

Change-Id: Ia8267f3757b45089c969c79668aa6734d18187e0
Merge "xmm626x: Update libril to v9 [1/2]" into kk4.4