Squashed commit of the following:

commit 674f830709b75bb1b90a2e0200e7ec110fb574ac
Merge: 2bd4248 ed6b811
Author: Dan Pasanen <dan.pasanen@gmail.com>
Date:   Sat Sep 21 20:05:31 2013 -0500

    Merge remote-tracking branch 'caf/jb_2.6' into cm-10.2

commit 2bd4248dbaaa7a2d871c37891f1e73fa9a687612
Merge: c2bf615 0aecf16
Author: Dan Pasanen <dan.pasanen@gmail.com>
Date:   Sun Sep 22 00:33:53 2013 +0000

    Merge "apexq/expressatt: allow gpu app locking" into cm-10.2

commit c2bf615409b83956222e7461f185a95074ac57c1
Merge: 303aa39 d617ca0
Author: Shareef Ali <shareefalis@cyanogenmod.org>
Date:   Sat Sep 21 03:41:33 2013 +0000

    Merge "d2 et al.: disable OABI compat" into cm-10.2

commit 0aecf163152cdfcddfedfd1a4cf955af087a00f0
Author: David Daynard <nardholio@gmail.com>
Date:   Sun Sep 15 21:45:10 2013 -0400

    apexq/expressatt: allow gpu app locking

    - Iommu on apexq/expressatt is not broken like d2 and
      does not cause watchdog timeouts on the modem

    Change-Id: I98569b2d8e3c93be1050d43f455bbbe89c123e74

commit 303aa3925d41b239511c830179826caaec833186
Author: Dave Kleikamp <dave.kleikamp@oracle.com>
Date:   Thu Dec 15 15:44:45 2011 -0600

    AIO: Don't plug the I/O queue in do_io_submit()

    Asynchronous I/O latency to a solid-state disk greatly increased
    between the 2.6.32 and 3.0 kernels. By removing the plug from
    do_io_submit(), we observed a 34% improvement in the I/O latency.

    Unfortunately, at this level, we don't know if the request is to
    a rotating disk or not.

    Change-Id: I7101df956473ed9fd5dcff18e473dd93b688a5c1
    Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
    Cc: linux-aio@kvack.org
    Cc: Chris Mason <chris.mason@oracle.com>
    Cc: Jens Axboe <axboe@kernel.dk>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: Jeff Moyer <jmoyer@redhat.com>

commit e4db9b407f482a4732979423082169029b23d2f5
Author: David Daynard <nardholio@gmail.com>
Date:   Fri Sep 13 17:52:35 2013 -0400

    prima 3.2.3.172

    Change-Id: Ic8e7d319f76430ad5b807eb2a5264d2c66c86359

commit d617ca010a10b2c7ca84e914a1042c363993ec06
Author: David Daynard <nardholio@gmail.com>
Date:   Fri Sep 13 15:28:20 2013 -0400

    d2 et al.: disable OABI compat

    Commit fefc65c201fc50bd4f22602292bbf48c8df23450 removed the requirement
    for OABI compatibility back in April due to TLB crashes, but we still
    have it on.

    There is no reason I can think of to leave this on.

    Change-Id: Idec3a3f4a931db601ad469e892b30eb18be4deed

commit ed6b811906380e3aa833d444419f520eb4fa9f42
Merge: 3a0d33a 5294869
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Sep 3 07:31:33 2013 -0700

    Merge "ALSA: usb-audio: Fix the mixer control range limiting issue"

commit 5294869da9984f2687d04a732aade60febc19f5d
Author: Deepa Madiregama <dmadireg@codeaurora.org>
Date:   Wed Aug 21 17:54:08 2013 +0530

    ALSA: usb-audio: Fix the mixer control range limiting issue

    - mixer_ctl_set() function is limiting the volume level
      to particular range. This results in incorrect initial
      volume setting for that device.
    - In USB mixer while calculating the dBmin/dBmax values
      resolution factor is hardcoded to 256 which results in
      populating the wrong values for dBmin/dBmax.
    - Fix is to use appropriate resolution factor while
      calculating the dBmin/dBmax values.

    CRs-Fixed: 515012
    Change-Id: I502355af66f850bb65380c27333c3341fa43a947
    Signed-off-by: Deepa Madiregama <dmadireg@codeaurora.org>

commit 3a0d33a00eb63e593a1060596373f660e996ca93
Merge: c4f6d25 9ea4077
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Sep 3 00:52:57 2013 -0700

    Merge "ASoC: wcd9304: Fix dce and sta wait time"

commit c4f6d25508b00dddbd37e265e20def16ee6b1de6
Merge: 25092d5 405eb4e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Sep 2 07:59:15 2013 -0700

    Merge "msm: kgsl: use kgsl_mmu_device_setstate() whenever the gpu is idle"

commit 25092d569bfdaef8c8206cff1029ce749fb3acd7
Merge: b07d749 2bbb1ab
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Sep 2 06:29:51 2013 -0700

    Merge "msm: kgsl: use the same logic in adreno_idle and adreno_isidle"

commit 405eb4e6b0d66c805a01f1a1ec82b460fb606ee6
Author: Harsh Vardhan Dwivedi <hdwivedi@codeaurora.org>
Date:   Thu Aug 1 15:18:02 2013 -0600

    msm: kgsl: use kgsl_mmu_device_setstate() whenever the gpu is idle

    We really don't want new GPU commands or events to be generated
    just to manage the iommu while we are idle.

    Change-Id: I2e8740bee8c25c93bddc51a90a3370d151aaf558
    Signed-off-by: Jeremy Gebben <jgebben@codeaurora.org>
    (cherry picked from commit 1a3279ee70f72d67c5b259573096a9953257a9b5)
    Signed-off-by: Harsh Vardhan Dwivedi <hdwivedi@codeaurora.org>

commit b07d74912d01407920588c93c3be6fe1086afc46
Merge: 3815648 d880c96
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Sep 2 02:40:35 2013 -0700

    Merge "hwmon: qpnp-adc-scale: Fix batt_therm mapping table"

commit 9ea40776e40b6376644c24fa112f501fd2f23a12
Author: Simmi Pateriya <simmip@codeaurora.org>
Date:   Fri Aug 16 15:53:01 2013 +0530

    ASoC: wcd9304: Fix dce and sta wait time

    Apply correct dce and sta wait time based on calculation
    rather than using default values.

    CRs-Fixed: 521904
    Change-Id: I15578c8ca5ba606af3d7ded85014c178ffc1effe
    Signed-off-by: Simmi Pateriya <simmip@codeaurora.org>

commit d880c962244e39a4f51406c3154c5dd65f596e3a
Author: Siddartha Mohanadoss <smohanad@codeaurora.org>
Date:   Fri Aug 23 09:40:44 2013 -0700

    hwmon: qpnp-adc-scale: Fix batt_therm mapping table

    Mapping table for batt_therm used for converting voltage
    to temperature is incorrect after 65degC. Fix the voltage
    to temperature mapping for values after 65degC.

    Change-Id: Ib8534a2be3b66f61b4edbe8f283cfee9f873af81
    Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>

commit 2bbb1ab042a260a6fdce520f881bbf967095a6a6
Author: Jeremy Gebben <jgebben@codeaurora.org>
Date:   Tue Jul 9 08:22:15 2013 -0600

    msm: kgsl: use the same logic in adreno_idle and adreno_isidle

    These two functions need to agree on the meaning of "idle",
    so that calling adreno_isidle() right after an adreno_idle()
    will always return true.

    Change-Id: I7cddf73773186c3ec8b56c111affacac3b07fcc7
    Signed-off-by: Jeremy Gebben <jgebben@codeaurora.org>
    (cherry picked from commit 5365240cf0abf2d799dd849abca0dc5b46d4b784)
    Signed-off-by: Harsh Vardhan Dwivedi <hdwivedi@codeaurora.org>

    Signed-off-by: Sridhar Gujje <sgujje@codeaurora.org>