Fix compileing
Some formatting
Revert "ASoC: wm8994: Ensure there are enough BCLKs for four channels"

This reverts commit 3b6ae1807d29f8cacd63fddf513110f9308b4c8e.
Revert "ARM: OMAP2+: OPP: Fix to ensure check of right oppdef after bad one"

This reverts commit c3d6a03a5702fb0971109d235dd3c74a5bd08248.

Conflicts:
	arch/arm/mach-omap2/opp.c
Add SlimRoms defconfig

Also update CM defconfigs to 3.0.101
Remove leftover from Samsungs exFAT implementation
espresso10: remove hardcoded toolchain from Makefile

Change-Id: Id7c743ca2919a721079721abd74527e89445f690
video: sii9234: dynamically register and unregister input device

The RCP input device should only be registered as long as MHL is
connected

Original author for tuna: Greg Hackmann <ghackmann@google.com>

Change-Id: I044b04e7d6ffe48c5b837981a8656ca2bb13fa01
Signed-off-by: Andreas B <skate4life@gmx.de>
cpufreq: Bring smdk4x12's pegasusq governor to espresso10

Change-Id: I7c70e43d1ca68664006d0fa8e5c10584567baf31
configs: Enable pegasusq CPU governor

Change-Id: I0d680a39817bc753e081643b0d55787e55247219
futex-prevent-requeue-pi-on-same-futex.patch futex: Forbid uaddr == uaddr2 in futex_requeue(..., requeue_pi=1)

If uaddr == uaddr2, then we have broken the rule of only requeueing from
a non-pi futex to a pi futex with this call.  If we attempt this, then
dangling pointers may be left for rt_waiter resulting in an exploitable
condition.

This change brings futex_requeue() in line with futex_wait_requeue_pi()
which performs the same check as per commit 6f7b0a2a5c0f ("futex: Forbid
uaddr == uaddr2 in futex_wait_requeue_pi()")

[ tglx: Compare the resulting keys as well, as uaddrs might be
  	different depending on the mapping ]

Fixes CVE-2014-3153.

Change-Id: I88a914469f436a8f299bf53ab58a79bc716f3a99
Reported-by: Pinkie Pie
Signed-off-by: Will Drewry <wad@chromium.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Boeffla-Sound: Engine 1.6.0

Change-Id: I72f11a3bee4cbce4cfd4dca9bdd8dc40f540d63a
Boeffla Sound: FM radio not available with LTE models

set #ifdef conditional to disable unused logic

Credits to faux123 for the proper exclusions using #ifdefs instead of just removing the FM radio related code

Change-Id: I1051dc8ad7aa4c2a70ac56b2857867a23990b79f
Boeffla-Sound: Engine 1.6.3

- delayed apply of changed register settings (credits to Yank) to
  fix issues on CM
- delay time configurable via sysfs (credits to Yank)
- different headphone detection for s3 and note devices
- different call detection

Change-Id: I22b5e2aadefb14af6596781608d0e46b77b54122
Boeffla-Sound: Engine 1.6.4

- show settings in sysfs even if boeffla sound is switched off
- remove legacy interfaces for alternative eq settings + mic mode
- some code cleanup

Change-Id: I57c64c3ef5381aec6c77621ff5e33221dc6b1b81
Boeffla-Sound: Engine 1.6.5

- allow speaker minimum level of 20

Change-Id: I19511a5704c8a67e6591d488281cfe9c09822ed9
Boeffla-Sound: Engine 1.6.6

- allow minimum volume of 0 for both speaker and headphones

Change-Id: Ifaa3c5bf90485c9a40726a67201799fa45da60f2
USB: f_mass_storage: 2048 block size for cdrom devices

Bios will recognize the cdrom device like most other cdrom
devices. This allows people to boot ISOs from their phone.

Original by Andreas Kemnade:
http://www.spinics.net/lists/linux-usb/msg25178.html

Change-Id: Id8fba96e1683f6daa6330b1e59f4a4ca4fe5c271
usb: gadget: mass_storage: added sysfs entry for cdrom to LUNs

This patch adds a "cdrom" sysfs entry for each mass_storage LUN, just
like "ro" sysfs entry. This allows switching between USB and CD-ROM
emulation without reinserting the module or recompiling the kernel.

Change-Id: I30a0ffc7f6e9a7f12d95ca1ab07949868aba440c
Added optimized ARM RWSEM algorithm.

Change-Id: I340d80a663a7db3ac87f5c33cb21273b14fbeafa