Merge branch 'omni-4.4' into raw-4.4

Conflicts:
	arch/arm/mach-exynos/Makefile
Merge branch 'omni-4.4' into raw-4.4

Conflicts:
	arch/arm/configs/custom_n7000_defconfig
smdk4412: Boeffla sound 1.6.6

- allow minimum volume of 0 for both speaker and headphones
- default headphone volume is 57 now

Change-Id: I7e32de304ee4cd99d9cc23df005c037cd4026c33
i777: Set SElinux permissive using CMDLINE from kernel config

Change-Id: I3ce288a91a9dc1386c4e3b8b2b1019bc01a82d44
Merge "smdk4412: Boeffla sound 1.6.6" into android-4.4
drivers: cpufreq: add support for scaling available frequencies

this patch implements sysfs for scaling
between available cpu frequencies

also, it sets a safe limits during boot process

min: 200MHz
max: 1400|1600MHz

This change reverts this patch
https://gerrit.omnirom.org/#/c/5685/

Signed-off-by: Humberto Borba <humberos@gmail.com>
Change-Id: Ia424ee5fd125a9d45839091d8bd7057b8e560c15
Revert "Revert "smdk4412: sound: update soc & codecs""

This reverts commit 98683425414e2450518a2c06a626d809674fddcb.

Change-Id: Id2a60c553fbcb9b46b2ead787532527650de7dd4
mc1n2: Allow swapping of microphone ADC channels

The SGH-I777 libaudio has the configuration for
ADC0[0] and ADC0[1] swapped.

When using GT-I9100 libaudio, this results in
the microphones being improperly swapped between
the main mic and the NR mic near the earpiece.

This patch allows the mic channels to be swapped
within the driver to deal with incompatible libaudio.

It is configurable via
CONFIG_SND_SOC_MC1N2_MIC_ADC_SWAP in the defconfig
in case the SGH-I777 libaudio becomes available.

Change-Id: Id5738369f3614c6ccf710ac02ae96ee65eb4398b
Touchwake updates

Change-Id: Ib8b7b6ea03cf1ad26b8eaab14a8e2fd020b4e0da
smdk4412: fix mag cover turning screen off

when charger is plugged in or disconnected while cover is closed
and then opened.

Change-Id: Ifa74d3d0689e1a5c84a4683c2fe24918bc5ab87a
smdk4412: remove some logging I added

Change-Id: I264ee04c7c6726e68cdd186f22ab45dc8bf5be0f
smdk4412: update fimc_capture and sr130pc20 cam driver

-updates are from i605 4.3 kernel source
-updates + small hack fixes front cam on kona

Change-Id: If8348be6dbef50bb322a60d554d177e046eec429
dm: suppress endian warnings

Suppress sparse warnings about cpu_to_le32() by using __le32 types for
on-disk data etc.

Change-Id: I055dcfeaa32bc45f7ff18e168486dbb926302962
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
dm: ignore merge_bvec for snapshots when safe

Add a new flag DMF_MERGE_IS_OPTIONAL to struct mapped_device to indicate
whether the device can accept bios larger than the size its merge
function returns.  When set, use this to send large bios to snapshots
which can split them if necessary.  Snapshot I/O may be significantly
fragmented and this approach seems to improve peformance.

Before the patch, dm_set_device_limits restricted bio size to page size
if the underlying device had a merge function and the target didn't
provide a merge function.  After the patch, dm_set_device_limits
restricts bio size to page size if the underlying device has a merge
function, doesn't have DMF_MERGE_IS_OPTIONAL flag and the target doesn't
provide a merge function.

The snapshot target can't provide a merge function because when the merge
function is called, it is impossible to determine where the bio will be
remapped.  Previously this led us to impose a 4k limit, which we can
now remove if the snapshot store is located on a device without a merge
function.  Together with another patch for optimizing full chunk writes,
it improves performance from 29MB/s to 40MB/s when writing to the
filesystem on snapshot store.

If the snapshot store is placed on a non-dm device with a merge function
(such as md-raid), device mapper still limits all bios to page size.

Change-Id: I5ea882b000ee951bd1ad336f2d9fb5af6da74e98
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
dm table: share target argument parsing functions

Move multipath target argument parsing code into dm-table so other
targets can share it.

Change-Id: Ifb06ced86c10ceae89a82c846d79cbe1332f60d6
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
dm crypt: optionally support discard requests

Add optional parameter field to dmcrypt table and support
"allow_discards" option.

Discard requests bypass crypt queue processing. Bio is simple remapped
to underlying device.

Note that discard will be never enabled by default because of security
consequences.  It is up to the administrator to enable it for encrypted
devices.

(Note that userspace cryptsetup does not understand new optional
parameters yet.  Support for this will come later.  Until then, you
should use 'dmsetup' to enable and disable this.)

Change-Id: I805513f9592e9c2f27f9586bd6445fcc70bb8d59
Signed-off-by: Milan Broz <mbroz@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
smdk4412: update mali driver

from GT-N7100_SEA_KK_Opensource

Change-Id: I1ddaa2c88660427348f359a6477aced196c4d7dc
smdk4412: fix build

Change-Id: I3b9e6cee7343c9dd3a7ae68694e60991047db50d
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
cpuidle-exynos4: calm down some logspam

* noticed these CONSTANTLY flooding the log with screen off
  using wireless adb (so it was unplugged)

Change-Id: I4df4f0da9f62cfd86552b77c71d4a2de11dac5d4
s3cfb_ops: Attempt to fix LPM (off charging mode) graphics issue

Change-Id: I4af44a979e5ab3b9d29888ce178ea9c0f71432b3