M2: camera: Enable CAMIF SOF in case of non dual camera usecase.

When Dual camera usecase is enabled, the ISPIF PIX SOF is enabled
by default to synchronize with the RDI interfaces.
But in non dual camera usecases, use CAMIF SOF IRQ to increment
the frame IDs being embedded inside the output frames.
Sometimes the SOF IRQs of frame 'n' is clubbed along with the
Output IRQs of the frame 'n-1'. Thus although the output IRQs
are supposed for frame 'n-1' it results in a frame ID of 'n' which
will cause incorrect behaviour downstream. Correct this behaviour
by checking the SOF and Output status bits in the IRQ Mask and
adjust the frame ID accordingly.

*detule: Also add similar checks for camif + stats irqs (as in upstream
driver)

CRs-Fixed: 481721
Change-Id: If7a9db2337febf10e89d44c58b9d980d874c69b6
Signed-off-by: Sai Kumar Sanagavarapu <ssanagav@codeaurora.org>
Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>
M2: camera: reset internal variables on reset interrupt
M2: camera: Recovery through camif stop and overall reset.

Add recovery mechanism in case of bus overflow. As part of the
recovery, stop the CAMIF, reset the VFE and reload the AXI
write masters and then restore the IRQ settings to VFE.

Change-Id: Iba6576777f05135cc13c1ee0c9db764d35c7282a
Signed-off-by: Kevin Chan <ktchan@codeaurora.org>
Signed-off-by: Praveen Ac <praveenac@codeaurora.org>
Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>
M2: camera: Add recovery routine for live snapshot.

During live snapshot, if bus overflow happen, recovery routine will
kick in and reset the hardware. At this point, the live snapshot
might not be completed and application will continue to wait for
the snapshot to complete. This change adds the logic to restart
the snapshot process after recovery is completed.

*detule: we don't use Live Snapshot.  Mangle the patch, and only port
recovery_active pertinent code.

Change-Id: I9ba0a27ce53eb008a4af8d65a3f37a7cded03559
Signed-off-by: Kevin Chan <ktchan@codeaurora.org>
Signed-off-by: Praveen Ac <praveenac@codeaurora.org>
Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>
M2: camera: Move halt logic in case of overflow to ISR.

Move the halt logic which includes AXI HALT and CAMIF Disable
to ISR to start the recovery mechanism sooner.
Add some protection in case of liveshot.

*detule: Again, omit liveshot lines.

Change-Id: I28ec462474524c0064cd7ecd4f77801cd494e514
Signed-off-by: Kevin Chan <ktchan@codeaurora.org>
Signed-off-by: Praveen Ac <praveenac@codeaurora.org>
Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>
M2: msm: Enable MSM_IOMMU for MACH_M2

And enjoy the free ram!
M2: msm: Enable IOMMU_GPU_SYNC

1. We need this to run with the new QdevNet adreno blobs.

2. HACK: prevent APPS side locking;  it's aggrevating the modem wdog.
Not sure why this happens, perhaps cpuidle, or preemption is
somehow responsible for the lock being held longer than anticipated.

3. Result is: serialized GPU-GPU acess to the context registers.
Apparently this is all that is needed to be able to use the QdevNet
adreno blobs.
M2: msm: grow MM heap size for the iommu use case

From 56 to 96 MB.

Too small of a heap and we get vidc induced iommu pagefaults when
recording 1080p video with the rear camera.

Change-Id: I70f2a1e76bda98c671ede22592ce564ce5fcd628
d2 kernel: Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_kernel_samsung_d2 into jellybean-mr2
net: bcmdhd: update to version 1.61.47 from the GT-9505 source drop

Change-Id: Ib21e86c4652be47c69aeaa5c22f93676962e6354
bcmdhd: Enable Ad-Hoc (IBSS) mode

Enable Ad-Hoc (IBSS) mode for bcmdhd. We basically just need to set the
interface flag and avoid some P2P specific settings while scanning.

Also add the "station get" command for IBSS mode.

Change-Id: Ie6f0fa77b55d92a7c22cbda72bad200cbfaede04
Signed-off-by: Bruno Randolf <br1@einfach.org>

Change-Id: I598c6d832cfd3dcc0ddbfb5dc29f29cb97cdbd8b
d2: Squashed revert of msm_serial_hs.c updates

Reverts d0351295f9774e837d9bd05469ba90a0bac77667 and 9fcb8efb0242207c91e8fe1179f806ae2fb6fb1b

Commit 9fcb8efb0242207c91e8fe1179f806ae2fb6fb1b is causing issues with Bluetooth issues on d2 devices (d2vzw primarily)

- Pairing issues with pair failures
- Handshaking issues after pairing with device timing out or numerious retry to connect
- Disconnect issues - lack of reconnecting issues

Revert confirms fix on d2vzw

Change-Id: I88df917560a7cfe03ff5da6e54c9af89bba6962b
Squashed commit of the following:

commit 0d56144c3fe1b3594ff8a48cd3b99082ca38644f
Merge: cc2cce5 cf7c3a8
Author: Wizard0f0s <jamie.gilmer@gmail.com>
Date:   Tue Jul 2 01:03:58 2013 -0400

    Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_kernel_samsung_d2 into cm-10.1

commit cf7c3a842e3474e396ab5259649fe4239b32afc1
Author: detule <ogjoneski@gmail.com>
Date:   Sat Jun 22 08:02:54 2013 -0400

    M2: sound: Update usage of clock enable/disable APIs.

    Use the new clk_prepare_enable/clk_disable_unprepare APIs in all
    instances.

    This fixes a PM leak, where the external codec clock is not disabled during
    suspend, due to unbalanced usage of the clk_un/prepare APIs.

    Change-Id: Ica036dbb0d9386062e8503b7236621f394b28d84

commit 4309d46b5ef29ccc013f105bb071adedf096f570
Author: Shareef Ali <shareefalis@cyanogenmod.org>
Date:   Sun Jun 30 15:06:23 2013 -0500

    msm: mdm2: use proper gpios

    Change-Id: Ifc957eb6240194c480285f829277b9a980148a48

commit aa7da4df0a5876a638fa400a88577cd0e3343f60
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Sep 11 20:13:10 2012 -0700

    drivers: cpufreq: Send a uevent when governor changes

     * Useful so userspace tools can reconfigure.

    Change-Id: Ib423910b8b9ac791ebe81a75bf399f58272f64f2

commit b59ade601411694c24e733aaa85f878b31639441
Merge: aff1224 c9669e5
Author: Dan Pasanen <dan.pasanen@gmail.com>
Date:   Tue Jun 25 21:21:49 2013 -0500

    Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.384' of git://codeaurora.org/kernel/msm into cm-10.1

    Conflicts:
    	arch/arm/mm/dma-mapping.c
    	include/media/msm_camera.h

    Change-Id: I11e8e7b480c61802d6c887ce8b0f6bab9a59cfef

commit aff1224ad3282fc906474c9d868c1e77f7c3fee7
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat Jun 22 19:11:53 2013 -0700

    m2: Raise MDP bandwidth values

     * Apparently some users are still having underruns. Raise the bw
       multipliers a bit again to fix CYAN-1405.

    Change-Id: If1f033eacd5745121711d3fe8a1001860d9f28c9

commit c9669e5c61143134936d1cb5307fd0caea9ccd7c
Merge: 13fecc6 e70ebb2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jun 20 18:09:48 2013 -0700

    Merge "msm: rotator: Pass ION flags correctly for 2-pass buffer allocation"

commit e70ebb2c369d194676caf4fb7743da49dbe9c2a3
Author: Padmanabhan Komanduru <pkomandu@codeaurora.org>
Date:   Thu Jun 20 15:14:57 2013 +0530

    msm: rotator: Pass ION flags correctly for 2-pass buffer allocation

    With updated ION interface, ION_SECURE needs to be passed as a
    separate flag. Also, 2-pass buffer for secure session needs to be
    allocated from CP heap instead of non-secure heap.

    CRs-fixed: 502038
    Change-Id: I8c5f945dc4d90ce640872e2cd0505ac32e82011d
    Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>

commit 13fecc69366dea8110e2c9bdd0bb6e72629be511
Merge: 5d8a2c8 dcba54f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jun 19 22:26:22 2013 -0700

    Merge "msm: camera: Enable frame based AXI WM for RDI0"

commit 5d8a2c82dbdddde6fdcc26e668ff85cebe45057f
Merge: d9ea587 6638a26
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jun 19 22:25:39 2013 -0700

    Merge "ASoC: msm: qdsp6v2: Fix bug in device V2 command"

commit d9ea587cfb13a3c2061a0ffb85b9b0c3cb81753d
Merge: e362402 9b9836d
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jun 19 07:50:56 2013 -0700

    Merge "input: synaptics_i2c_rmi4: Register for FB events"

commit e36240271fa04a36dad0904c73f68044b1e5730a
Merge: 8798200 e0aae9e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jun 19 07:50:44 2013 -0700

    Merge "power: pm8921-bms: Notify userspace after a new FCC is generated"

commit 87982004f86335676c612d5d42d8155aeadc69a2
Merge: a6d62a4 9e92287
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jun 19 07:50:41 2013 -0700

    Merge "power: pm8921-bms: Fix variable naming"

commit a6d62a4edc05156feb3c9839a33c1fcb9db090b4
Merge: 06d9a3e 37c1040
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jun 19 05:22:17 2013 -0700

    Merge "msm:camera: Increase the v4l2 event queue length"

commit 06d9a3e25e7a7db8604fc54f99422dee3d5bf4f1
Merge: b36f0aa 2bd6b20
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jun 19 05:22:05 2013 -0700

    Merge "msm: msm_fb: Add range checks for fb cmap."

commit b36f0aa2bcf855cb4364f5fc01f73f1a671eb89b
Merge: 360ed10 ff3c583
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jun 19 05:21:53 2013 -0700

    Merge "msm: camera: Send VFE_REG_UPDATE_CMD while enabling liveshot."

commit 360ed105fc9f3b60326edb5d46e13b28f2995e1e
Merge: b596a29 78725fa
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jun 19 05:21:33 2013 -0700

    Merge "msm: camera: Add mechanism to stop overflow recovery and handle IOMMU pagefault"

commit 9b9836db0591b407b7d8c84867e785e743fa0e4c
Author: Amy Maloche <amaloche@codeaurora.org>
Date:   Fri Feb 15 17:09:43 2013 -0800

    input: synaptics_i2c_rmi4: Register for FB events

    Register to recieve FB notifications and do suspend
    when the display goes off and resume when it turns
    back on.

    Change-Id: I5ad02a7080225b724deae06d5443e0f9f8fd6929
    Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
    Signed-off-by: Shantanu Jain <shjain@codeaurora.org>

commit e0aae9e254647cce50a9bc9c5a17f34a80b9b434
Author: Anirudh Ghayal <aghayal@codeaurora.org>
Date:   Tue Jun 18 05:46:29 2013 +0530

    power: pm8921-bms: Notify userspace after a new FCC is generated

    Any modification to the FCC is reported to the userspace
    so that it can take the required action.

    Change-Id: I0748218540e89278bbc720ec9de6bdb949e5f162
    Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>

commit 9e9228768dae7b34217ad89301b0cbc910e6a39f
Author: Anirudh Ghayal <aghayal@codeaurora.org>
Date:   Thu Jun 13 19:03:58 2013 +0530

    power: pm8921-bms: Fix variable naming

    The max_fcc_learning_cycles variable actually indicates
    the minimum number of FCC cycles required to update a new FCC,
    name it accordingly.

    Change-Id: I510d3a05eed736a9ee560c936faa20ed2d3c5bd1
    Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>

commit 48ffc639be06cac9f752cb9fb2330f3cc72da20f
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Jun 18 21:03:19 2013 -0700

    msm_serial_hs: Underp

    Change-Id: I91eecc4afa4fa108332741c525c305411ad96949

commit d5eb29c492aa4a51e24d1395e0c0f437a613f304
Author: Colin Cross <ccross@android.com>
Date:   Mon May 6 23:50:21 2013 +0000

    af_unix: use freezable blocking calls in read

    Avoid waking up every thread sleeping in read call on an AF_UNIX
    socket during suspend and resume by calling a freezable blocking
    call.  Previous patches modified the freezer to avoid sending
    wakeups to threads that are blocked in freezable blocking calls.

    This call was selected to be converted to a freezable call because
    it doesn't hold any locks or release any resources when interrupted
    that might be needed by another freezing task or a kernel driver
    during suspend, and is a common site where idle userspace tasks are
    blocked.

    Change-Id: I788246a76780ea892659526e70be018b18f646c4
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Colin Cross <ccross@android.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

commit fe81704b44e66d77826af7043c7e29641a5236f2
Author: Colin Cross <ccross@android.com>
Date:   Mon May 6 23:50:20 2013 +0000

    sigtimedwait: use freezable blocking call

    Avoid waking up every thread sleeping in a sigtimedwait call during
    suspend and resume by calling a freezable blocking call.  Previous
    patches modified the freezer to avoid sending wakeups to threads
    that are blocked in freezable blocking calls.

    This call was selected to be converted to a freezable call because
    it doesn't hold any locks or release any resources when interrupted
    that might be needed by another freezing task or a kernel driver
    during suspend, and is a common site where idle userspace tasks are
    blocked.

    Change-Id: Ic27469b60a67d50cdc0d0c78975951a99c25adcd
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Colin Cross <ccross@android.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

commit a7b95f71e927e5664ee89ef29b200d94ab0be20c
Author: Colin Cross <ccross@android.com>
Date:   Mon May 6 23:50:19 2013 +0000

    nanosleep: use freezable blocking call

    Avoid waking up every thread sleeping in a nanosleep call during
    suspend and resume by calling a freezable blocking call.  Previous
    patches modified the freezer to avoid sending wakeups to threads
    that are blocked in freezable blocking calls.

    This call was selected to be converted to a freezable call because
    it doesn't hold any locks or release any resources when interrupted
    that might be needed by another freezing task or a kernel driver
    during suspend, and is a common site where idle userspace tasks are
    blocked.

    Change-Id: I93383201d4dd62130cd9a9153842d303fc2e2986
    Acked-by: Tejun Heo <tj@kernel.org>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Colin Cross <ccross@android.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

commit 276931f3e11cedf9fd8853f508518ed271d357f3
Author: Colin Cross <ccross@android.com>
Date:   Mon May 6 23:50:18 2013 +0000

    futex: use freezable blocking call

    Avoid waking up every thread sleeping in a futex_wait call during
    suspend and resume by calling a freezable blocking call.  Previous
    patches modified the freezer to avoid sending wakeups to threads
    that are blocked in freezable blocking calls.

    This call was selected to be converted to a freezable call because
    it doesn't hold any locks or release any resources when interrupted
    that might be needed by another freezing task or a kernel driver
    during suspend, and is a common site where idle userspace tasks are
    blocked.

    Change-Id: I9ccab9c2d201adb66c85432801cdcf43fc91e94f
    Acked-by: Tejun Heo <tj@kernel.org>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: Darren Hart <dvhart@linux.intel.com>
    Signed-off-by: Colin Cross <ccross@android.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

commit 9b03388ef067cd1dd1474045a057ce8d276d85c6
Author: Colin Cross <ccross@android.com>
Date:   Mon May 6 23:50:17 2013 +0000

    select: use freezable blocking call

    Avoid waking up every thread sleeping in a select call during
    suspend and resume by calling a freezable blocking call.  Previous
    patches modified the freezer to avoid sending wakeups to threads
    that are blocked in freezable blocking calls.

    This call was selected to be converted to a freezable call because
    it doesn't hold any locks or release any resources when interrupted
    that might be needed by another freezing task or a kernel driver
    during suspend, and is a common site where idle userspace tasks are
    blocked.

    Change-Id: I0d7565ec0b6bc5d44cb55f958589c56e6bd16348
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Colin Cross <ccross@android.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

commit 4cf725aff0fb8038b55ef0ef4d52db51a289db11
Author: Colin Cross <ccross@android.com>
Date:   Mon May 6 23:50:16 2013 +0000

    epoll: use freezable blocking call

    Avoid waking up every thread sleeping in an epoll_wait call during
    suspend and resume by calling a freezable blocking call.  Previous
    patches modified the freezer to avoid sending wakeups to threads
    that are blocked in freezable blocking calls.

    This call was selected to be converted to a freezable call because
    it doesn't hold any locks or release any resources when interrupted
    that might be needed by another freezing task or a kernel driver
    during suspend, and is a common site where idle userspace tasks are
    blocked.

    Change-Id: I848d08d28c89302fd42bbbdfa76489a474ab27bf
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Colin Cross <ccross@android.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

commit 06e4f9d6221373a3ee6c36f4fbfbbd6a22b4e67f
Author: Rafael J. Wysocki <rjw@sisk.pl>
Date:   Mon May 21 21:20:48 2012 +0200

    epoll: Fix user space breakage related to EPOLLWAKEUP

    Commit 4d7e30d (epoll: Add a flag, EPOLLWAKEUP, to prevent
    suspend while epoll events are ready) caused some applications to
    malfunction, because they set the bit corresponding to the new
    EPOLLWAKEUP flag in their eventpoll flags and they don't have the
    new CAP_EPOLLWAKEUP capability.

    To prevent that from happening, change epoll_ctl() to clear
    EPOLLWAKEUP in epds.events if the caller doesn't have the
    CAP_EPOLLWAKEUP capability instead of failing and returning an
    error code, which allows the affected applications to function
    normally.

    Reported-and-tested-by: Jiri Slaby <jslaby@suse.cz>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

commit 86166201cea736a25c01c2fc962cb452e6fa98bc
Author: Arve Hjønnevåg <arve@android.com>
Date:   Tue May 1 21:33:34 2012 +0200

    epoll: Add a flag, EPOLLWAKEUP, to prevent suspend while epoll events are ready

    When an epoll_event, that has the EPOLLWAKEUP flag set, is ready, a
    wakeup_source will be active to prevent suspend. This can be used to
    handle wakeup events from a driver that support poll, e.g. input, if
    that driver wakes up the waitqueue passed to epoll before allowing
    suspend.

    Signed-off-by: Arve Hjønnevåg <arve@android.com>
    Reviewed-by: NeilBrown <neilb@suse.de>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

commit 82d5ca1e93c05e6e447915135284961c78173ea8
Author: Colin Cross <ccross@android.com>
Date:   Mon May 6 23:50:15 2013 +0000

    binder: use freezable blocking calls

    Avoid waking up every thread sleeping in a binder call during
    suspend and resume by calling a freezable blocking call.  Previous
    patches modified the freezer to avoid sending wakeups to threads
    that are blocked in freezable blocking calls.

    This call was selected to be converted to a freezable call because
    it doesn't hold any locks or release any resources when interrupted
    that might be needed by another freezing task or a kernel driver
    during suspend, and is a common site where idle userspace tasks are
    blocked.

    Change-Id: Ic4458ae90447f6caa895cc62f08e515caa7790ba
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Colin Cross <ccross@android.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

commit 44d091fbdfa01a72012e8cb2c6e8fead5abe7573
Author: Colin Cross <ccross@android.com>
Date:   Mon May 6 23:50:14 2013 +0000

    freezer: add new freezable helpers using freezer_do_not_count()

    Freezing tasks will wake up almost every userspace task from
    where it is blocking and force it to run until it hits a
    call to try_to_sleep(), generally on the exit path from the syscall
    it is blocking in.  On resume each task will run again, usually
    restarting the syscall and running until it hits the same
    blocking call as it was originally blocked in.

    To allow tasks to avoid running on every suspend/resume cycle,
    this patch adds additional freezable wrappers around blocking calls
    that call freezer_do_not_count().  Combined with the previous patch,
    these tasks will not run during suspend or resume unless they wake
    up for another reason, in which case they will run until they hit
    the try_to_freeze() in freezer_count(), and then continue processing
    the wakeup after tasks are thawed.

    Additional patches will convert the most common locations that
    userspace blocks in to use freezable helpers.

    Change-Id: Id909760ce460f2532801a4b00d344f0816bfefc9
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Colin Cross <ccross@android.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

commit aaf30723344cd48b34da8f993bbd7e490620fe63
Author: Colin Cross <ccross@android.com>
Date:   Mon May 6 23:50:13 2013 +0000

    freezer: convert freezable helpers to static inline where possible

    Some of the freezable helpers have to be macros because their
    condition argument needs to get evaluated every time through
    the wait loop.  Convert the others to static inline to make
    future changes easier.

    Change-Id: I69d3fc10d26522cb9bf3a616ff4f21245f9c071a
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Colin Cross <ccross@android.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

commit 5d7835bc8cbef663d6f3e5bc693dd236bf365360
Author: Colin Cross <ccross@android.com>
Date:   Mon May 6 23:50:12 2013 +0000

    freezer: convert freezable helpers to freezer_do_not_count()

    Freezing tasks will wake up almost every userspace task from
    where it is blocking and force it to run until it hits a
    call to try_to_sleep(), generally on the exit path from the syscall
    it is blocking in.  On resume each task will run again, usually
    restarting the syscall and running until it hits the same
    blocking call as it was originally blocked in.

    Convert the existing wait_event_freezable* wrappers to use
    freezer_do_not_count().  Combined with a previous patch,
    these tasks will not run during suspend or resume unless they wake
    up for another reason, in which case they will run until they hit
    the try_to_freeze() in freezer_count(), and then continue processing
    the wakeup after tasks are thawed.

    This results in a small change in behavior, previously a race
    between freezing and a normal wakeup would be won by the wakeup,
    now the task will freeze and then handle the wakeup after thawing.

    Change-Id: I532e62251f58c1a9ca488b3fb6220c53acf7d33d
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Colin Cross <ccross@android.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

commit 3049fcc258d94ce42f08304e3f776c0e66561500
Author: Colin Cross <ccross@android.com>
Date:   Mon May 6 23:50:11 2013 +0000

    freezer: skip waking up tasks with PF_FREEZER_SKIP set

    Android goes through suspend/resume very often (every few seconds when
    on a busy wifi network with the screen off), and a significant portion
    of the energy used to go in and out of suspend is spent in the
    freezer.  If a task has called freezer_do_not_count(), don't bother
    waking it up.  If it happens to wake up later it will call
    freezer_count() and immediately enter the refrigerator.

    Combined with patches to convert freezable helpers to use
    freezer_do_not_count() and convert common sites where idle userspace
    tasks are blocked to use the freezable helpers, this reduces the
    time and energy required to suspend and resume.

    Change-Id: I6ba019d24273619849af757a413271da3261d7db
    Acked-by: Tejun Heo <tj@kernel.org>
    Acked-by: Pavel Machek <pavel@ucw.cz>
    Signed-off-by: Colin Cross <ccross@android.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

commit 324da9d0ff383f8bc045bb2eb0163546cee594e4
Author: Colin Cross <ccross@android.com>
Date:   Mon May 6 23:50:10 2013 +0000

    freezer: shorten freezer sleep time using exponential backoff

    All tasks can easily be frozen in under 10 ms, switch to using
    an initial 1 ms sleep followed by exponential backoff until
    8 ms.  Also convert the printed time to ms instead of centiseconds.

    Change-Id: I7b198b16eefb623c2b0fc45dce50d9bca320afdc
    Acked-by: Pavel Machek <pavel@ucw.cz>
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Colin Cross <ccross@android.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

    Conflicts:
    	kernel/power/process.c

commit 1c30870f46bbcbc6c0e3070eb646b0e0dd2e6a53
Author: Mandeep Singh Baines <msb@chromium.org>
Date:   Mon May 6 23:50:09 2013 +0000

    lockdep: check that no locks held at freeze time

    We shouldn't try_to_freeze if locks are held.  Holding a lock can cause a
    deadlock if the lock is later acquired in the suspend or hibernate path
    (e.g.  by dpm).  Holding a lock can also cause a deadlock in the case of
    cgroup_freezer if a lock is held inside a frozen cgroup that is later
    acquired by a process outside that group.

    History:
    This patch was originally applied as 6aa9707099c and reverted in
    dbf520a9d7d4 because NFS was freezing with locks held.  It was
    deemed better to keep the bad freeze point in NFS to allow laptops
    to suspend consistently.  The previous patch in this series converts
    NFS to call _unsafe versions of the freezable helpers so that
    lockdep doesn't complain about them until a more correct fix
    can be applied.

    Change-Id: Ib9d4299fb75a39e611b868be42e413909a994baa
    [akpm@linux-foundation.org: export debug_check_no_locks_held]
    Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Acked-by: Pavel Machek <pavel@ucw.cz>
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Colin Cross <ccross@android.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

commit af56b143b87b5ffdd470a127338510f725fdad4f
Author: Colin Cross <ccross@android.com>
Date:   Mon May 6 23:50:08 2013 +0000

    lockdep: remove task argument from debug_check_no_locks_held

    The only existing caller to debug_check_no_locks_held calls it
    with 'current' as the task, and the freezer needs to call
    debug_check_no_locks_held but doesn't already have a current
    task pointer, so remove the argument.  It is already assuming
    that the current task is relevant by dumping the current stack
    trace as part of the warning.

    This was originally part of 6aa9707099c (lockdep: check that
    no locks held at freeze time) which was reverted in
    dbf520a9d7d4.

    Change-Id: Idbaf1332ce6c80dc49c1d31c324c7fbf210657c5
    Original-author: Mandeep Singh Baines <msb@chromium.org>
    Acked-by: Pavel Machek <pavel@ucw.cz>
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Colin Cross <ccross@android.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

commit 6bd7b82e9401886ed065e4fb381a0ff31e5e90d3
Author: Colin Cross <ccross@android.com>
Date:   Tue May 7 17:52:05 2013 +0000

    freezer: add unsafe versions of freezable helpers for CIFS

    CIFS calls wait_event_freezekillable_unsafe with a VFS lock held,
    which is unsafe and will cause lockdep warnings when 6aa9707
    "lockdep: check that no locks held at freeze time" is reapplied
    (it was reverted in dbf520a).  CIFS shouldn't be doing this, but
    it has long-running syscalls that must hold a lock but also
    shouldn't block suspend.  Until CIFS freeze handling is rewritten
    to use a signal to exit out of the critical section, add a new
    wait_event_freezekillable_unsafe helper that will not run the
    lockdep test when 6aa9707 is reapplied, and call it from CIFS.

    In practice the likley result of holding the lock while freezing
    is that a second task blocked on the lock will never freeze,
    aborting suspend, but it is possible to manufacture a case using
    the cgroup freezer, the lock, and the suspend freezer to create
    a deadlock.  Silencing the lockdep warning here will allow
    problems to be found in other drivers that may have a more
    serious deadlock risk, and prevent new problems from being added.

    Change-Id: I420c5392bacf68e58e268293b2b36068ad4df753
    Acked-by: Pavel Machek <pavel@ucw.cz>
    Acked-by: Tejun Heo <tj@kernel.org>
    Reviewed-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Colin Cross <ccross@android.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

commit 2f958efac549d982d74a7083be307174ff161700
Author: Colin Cross <ccross@android.com>
Date:   Mon May 6 23:50:06 2013 +0000

    freezer: add unsafe versions of freezable helpers for NFS

    NFS calls the freezable helpers with locks held, which is unsafe
    and will cause lockdep warnings when 6aa9707 "lockdep: check
    that no locks held at freeze time" is reapplied (it was reverted
    in dbf520a).  NFS shouldn't be doing this, but it has
    long-running syscalls that must hold a lock but also shouldn't
    block suspend.  Until NFS freeze handling is rewritten to use a
    signal to exit out of the critical section, add new *_unsafe
    versions of the helpers that will not run the lockdep test when
    6aa9707 is reapplied, and call them from NFS.

    In practice the likley result of holding the lock while freezing
    is that a second task blocked on the lock will never freeze,
    aborting suspend, but it is possible to manufacture a case using
    the cgroup freezer, the lock, and the suspend freezer to create
    a deadlock.  Silencing the lockdep warning here will allow
    problems to be found in other drivers that may have a more
    serious deadlock risk, and prevent new problems from being added.

    Change-Id: Ia17d32cdd013a6517bdd5759da900970a4427170
    Signed-off-by: Colin Cross <ccross@android.com>
    Acked-by: Pavel Machek <pavel@ucw.cz>
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

commit eb810ea7feb78803e8504548fdb029da80abe8ed
Author: Colin Cross <ccross@android.com>
Date:   Wed Aug 15 13:10:04 2012 -0700

    HACK: ARM: disable sleeping while atomic warning in do_signal

    ARM disables interrupts in do_signal, which triggers a warning in
    try_to_freeze, see details at https://lkml.org/lkml/2011/8/23/221.
    To prevent the warnings, add try_to_freeze_nowarn and call it from
    do_signal.

    Change-Id: If7482de21c386adc705fa1ac4ecb8c7ece5bb356
    Signed-off-by: Colin Cross <ccross@android.com>

commit 6c738444ea3f561dbb71d2f320eb8e358bcddf4e
Merge: f772844 8b638b3
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Jun 18 20:13:09 2013 -0700

    Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.375' of git://codeaurora.org/kernel/msm into cm-10.1

    AU_LINUX_ANDROID_JB_2.5.04.02.02.040.375 based on quic/aosp/jb_2.5

    Change-Id: I1cc84a728c21fb8b79a89ad1935e572c4713dafc

commit f77284415b3e059454d6faaccbc8438bbc911d97
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Jun 18 20:12:49 2013 -0700

    Revert "d2: Squashed revert of msm_serial_hs.c updates"

    This reverts commit a5cab2452cdc401d04abfc1f9f89ad79b7c771b2.

commit c173abff257e67f8bdfb66805be87ac0a3960fbd
Merge: 78e800d 6825d79
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Jun 18 19:28:41 2013 -0700

    Merge branch 'next' of git://github.com/CyanogenMod/android_kernel_samsung_d2 into cm-10.1

commit ff3c583d2fa855cd5488a4d7915b3b83c8c24250
Author: Sai Kumar Sanagavarapu <ssanagav@codeaurora.org>
Date:   Wed Jun 12 11:54:01 2013 +0530

    msm: camera: Send VFE_REG_UPDATE_CMD while enabling liveshot.

    Sometimes, especially with YUV sensors, snapshot frame is
    not received in time when liveshot is triggered.

    CRs-Fixed: 501466
    Change-Id: Ib92929ebe82eadb92492d899b2077832fab02842

    Signed-off-by: Sai Kumar Sanagavarapu <ssanagav@codeaurora.org>

commit b596a29c7a8c30b8fc4f976014ed2e03bad08018
Merge: cd85e09 3d67364
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 18 00:46:35 2013 -0700

    Merge "msm: Fix race condition in domain lookup"

commit cd85e09a5e1e1ed2a0a58de95e446f2a7a50b59f
Merge: 2f7afaf 0e0725e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 18 00:46:11 2013 -0700

    Merge "msm: kgsl: Remove extra call to sync_fence_put()"

commit 2f7afaf2bab5c0796795eb7ffbed4196f94f22c1
Merge: 54cf3f8 14a988b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 18 00:45:47 2013 -0700

    Merge "board: 8064: add 192MHz clock support for SDC1 slot"

commit 54cf3f899f1819b690794568404f8022877c104e
Merge: cbac37c c684930
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 18 00:45:36 2013 -0700

    Merge "USB: gadget: Cleanup boot-up message with default usb composition"

commit cbac37cd67c531788efa40dcd81e23a5604a783a
Merge: 581fb27 54f4b6f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 18 00:45:11 2013 -0700

    Merge "msm: msm_bus: Explicitly clear client requests before removal"

commit 581fb27f6030c86c559ff1a927918e9229e9cc00
Merge: c8c396d 13285c5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 18 00:44:54 2013 -0700

    Merge "ARM: 7693/1: mm: clean-up in order to reduce to call kmap_high_get()"

commit c8c396d1849281e401054de2088097b93a70cdec
Merge: a80c5e0 33894d5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 18 00:44:45 2013 -0700

    Merge "msm: msm_bus: Add NULL pointer check"

commit a80c5e067ed8cd6968d8bdd9cfd9a0ecfd8a4925
Merge: 3c691e5 d68f9af
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 18 00:44:33 2013 -0700

    Merge "msm: kgsl: generate descriptive names for kgsl-timeline"

commit 3c691e56b8b408d8d7074253adcc0f239de588b3
Merge: 01d9603 e47a43b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 18 00:44:24 2013 -0700

    Merge "msm: kgsl: show timestamp in sync dump"

commit 01d960318b984d44d7f65b27b4c265329b7cc8fd
Merge: 04cc0cd 4bd475a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 18 00:44:15 2013 -0700

    Merge "base: sync: increase size of sync_timeline name"

commit 04cc0cd82037151c514869b3c7e94938dac4a7bf
Merge: 7af0efe 0179fad
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 18 00:43:57 2013 -0700

    Merge "arm: board-8930: Add synaptics firmware name in platform data"

commit 7af0efe3bfa404c98da620945024d3f54ceb8c9c
Merge: 1f5df9e d0a4aeb
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 18 00:43:55 2013 -0700

    Merge "input: synaptics_i2c_rmi4: Properly enter low power mode"

commit 1f5df9e1d022fe482b31306c7c93ae7a3fd4e4cd
Merge: c39ef5d 3052d6c
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 18 00:43:52 2013 -0700

    Merge "input: synaptics_fw_update: Add force update entry"

commit c39ef5d4f149b5c141d2f5201ae13e05e8b94897
Merge: d2848a0 6750381
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 18 00:43:50 2013 -0700

    Merge "input: synaptics_fw_update: Add firmware ID reading"

commit d2848a0e03f7870791a58d1fbf2fd6df434836fc
Merge: fc2053b 524e230
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 18 00:43:47 2013 -0700

    Merge "input: synaptics_i2c_rmi4: allocate memory for interrupt status"

commit fc2053b56f7feaa63bbe678d125ac33f221adba7
Merge: 9d74748 72dfae2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 18 00:43:45 2013 -0700

    Merge "input: synaptics_i2c_rmi4: Add low power mode"

commit dcba54f8ef6977cf353ff31d215828ebb91d73ec
Author: Sai Kumar Sanagavarapu <ssanagav@codeaurora.org>
Date:   Mon Jun 17 16:52:41 2013 +0530

    msm: camera: Enable frame based AXI WM for RDI0

    Frame based AXI WM configuration for RDI0 path
    Also populate sensor type in the device info structure.

    Change-Id: Ib6d65cd8cb1e4655c4f67903a8f329962512115e
    Signed-off-by: Sai Kumar Sanagavarapu <ssanagav@codeaurora.org>

commit 6638a26ee5e974a2f303171d20fef741c4ed01db
Author: Venkat Sudhir <vsudhir@codeaurora.org>
Date:   Mon Jun 17 14:21:14 2013 -0700

    ASoC: msm: qdsp6v2: Fix bug in device V2 command

    Add missing braces for Device V2 command failure case.
    Crs-fixed: 492994

    Change-Id: Ieacbbe94897a4fb73e6ffadc7d1bdcadb2b35dd2
    Signed-off-by: Venkat Sudhir <vsudhir@codeaurora.org>

commit 9d7474850a2dc59ebc5e2a45c7a6b5ace7106415
Merge: 158aac5 866c90f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 17 13:39:28 2013 -0700

    Merge "msm: camera: Optimize the live snapshot state machine"

commit 54f4b6f21688a785e7bf57ce44e128a138ccc221
Author: Gagan Mac <gmac@codeaurora.org>
Date:   Thu Oct 4 22:17:35 2012 -0600

    msm: msm_bus: Explicitly clear client requests before removal

    Clients can potentially leave non-zero requests before
    unregistering. Such requests persist and cause instability
    and severe power and performance impact.

    Protect the system against such clients by explicitly
    clearing the client requests before unregistration

    Change-Id: I6a905b097de41af168b5f5048b682ba995b581c2
    CRs-Fixed: 407057
    Signed-off-by: Gagan Mac <gmac@codeaurora.org>

commit 33894d5ebcabde3549c9dee47b86887cc2344a33
Author: Gagan Mac <gmac@codeaurora.org>
Date:   Thu Feb 28 13:25:33 2013 -0700

    msm: msm_bus: Add NULL pointer check

    This patch protects the bus driver against clients who try to
    update requests without registering the client

    Change-Id: Ie740844218dbabe5fca098798c461590aba42e97
    CRs-Fixed: 459651
    Signed-off-by: Gagan Mac <gmac@codeaurora.org>

commit e47a43b1cb7f5731ebd988761e20050675f856d9
Author: Fred Fettinger <fred.fettinger@motorola.com>
Date:   Fri Feb 8 16:19:15 2013 -0600

    msm: kgsl: show timestamp in sync dump

    Improve the debug information printed for kgsl points and timelines.

    kgsl_sync_pt_value_str:
      - show timestamp passed to kgsl_add_fence_event()
    kgsl_sync_timeline_value_str:
      - show most recent timestamp passed to kgsl_sync_timeline_signal()
      - show last retired timestamp according to kgsl_sync_get_timestamp()

    Change-Id: I93fe408b06de054b11e05784cd7175ed3fcb76ad
    Git-commit: 595e213985f63d6aa484c966a4f4a710b31ca209
    Git-repo: https://www.codeaurora.org/gitweb/quic/la/?p=kernel/msm.git
    Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
    Signed-off-by: Harsh Vardhan Dwivedi <hdwivedi@codeaurora.org>

commit 4bd475af149edff8389d7d2d5b4b845e9feb0c3b
Author: Fred Fettinger <fred.fettinger@motorola.com>
Date:   Fri Jan 11 14:20:40 2013 -0600

    base: sync: increase size of sync_timeline name

    This makes it possible for drivers to use a longer, more descriptive
    name for a sync_timeline, which improves the readability of the
    sync dump in debugfs.

    Change-Id: Ifb83aebf6fd820ebb26aca2ff230ac1116e65ce9
    Git-commit: cb63e61b80ec905f01cbe1c21081aa0d1fef082d
    Git-repo: https://www.codeaurora.org/gitweb/quic/la/?p=kernel/msm.git
    Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
    Signed-off-by: Harsh Vardhan Dwivedi <hdwivedi@codeaurora.org>

commit d68f9af8412ac3ab188c67fc86098a71f949d5e7
Author: Fred Fettinger <fred.fettinger@motorola.com>
Date:   Fri Jan 11 14:24:12 2013 -0600

    msm: kgsl: generate descriptive names for kgsl-timeline

    Generate names for kgsl-timelines using the following format:
    <device>-<thread name>(<tid>)-<proc name>(<pid>)-<context id>

    This makes it possible to identify the context of a timeline in the
    sync dump, which makes it much easier to identify which context has
    a GPU timeout.

    Change-Id: I0ce0614a53a93fd81094d92c9bef7053e6d416d2
    Git-commit: e3348f389f715cb2143a708ec6796d3f65e03821
    Git-repo: https://www.codeaurora.org/gitweb/quic/la/?p=kernel/msm.git
    Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
    Signed-off-by: Harsh Vardhan Dwivedi <hdwivedi@codeaurora.org>

commit 3d67364ec27f80d048bc90a58e874100fe797679
Author: Olav Haugan <ohaugan@codeaurora.org>
Date:   Wed Jun 5 14:13:40 2013 -0700

    msm: Fix race condition in domain lookup

    During lookup of domains we take a pointer to the root node
    of the rb tree before taking the mutex to protect the rb tree.
    However, the rb root node might change if another process updates
    the rb tree after we take the pointer to the root node. This can
    cause us to not find the entry that we are looking for.
    Fix this by ensuring we have taken the mutex before getting the
    root node pointer.

    CRs-fixed: 493503
    Change-Id: I4702740e486fda0cd92df0401d8e4706598a899b
    Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>

commit c68493087a000771ad8a7e1c7864d26ba50f3106
Author: Mayank Rana <mrana@codeaurora.org>
Date:   Wed Jun 12 12:29:54 2013 +0530

    USB: gadget: Cleanup boot-up message with default usb composition

    The print message with rmnet bind and adb_bind is enabled by default.
    It appears for each default composition switch. Watchdog timeout is
    seen if there is stability issue on device bootup with serial console
    enable. Hence move message loglevel from pr_info to pr_debug to
    resolve this issue.

    CRs-Fixed: 499244
    Change-Id: Ife129604a1d877a4c8c6b7cd7a75a6af2ff03578
    Signed-off-by: Mayank Rana <mrana@codeaurora.org>

commit 14a988bd89d88c45123f92868fd18d8119629c33
Author: Subhash Jadavani <subhashj@codeaurora.org>
Date:   Thu Sep 20 19:55:16 2012 +0530

    board: 8064: add 192MHz clock support for SDC1 slot

    8064 v2 HW can support card clock upto 192MHz on SDC1 slot.
    This patch adds the support for same by checking the 8064
    SOC revision.

    Change-Id: I9a119adb2490d9eb7cb227c9ae47c4766d44f140
    Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>

commit 158aac50a9938541ad4fdeedf8782849e1408d49
Merge: f53c3a3 56f461b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 17 02:43:59 2013 -0700

    Merge "msm: gemini: Fix the size argument of hw_region_dump function."

commit f53c3a3129e776841780b8bbf72a9213645e89a7
Merge: 8b638b3 731f15c
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 17 00:32:30 2013 -0700

    Merge "msm_fb: Increase base fence timeout"

commit 0e0725ef32fb460e9f2f0d32770f60d38d6bf13d
Author: Alex Wong <waiw@codeaurora.org>
Date:   Mon Apr 29 10:05:18 2013 -0700

    msm: kgsl: Remove extra call to sync_fence_put()

    sync_fence_put is called twice and cause NULL pointer dereference.

    Change-Id: Ia29e676af28d9040d1ba1ee8669f1306cc8b4035
    Signed-off-by: Alex Wong <waiw@codeaurora.org>

commit 8b638b3285550f970980dbf42541a2136d5be68b
Merge: 9c88925 972cfe0
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sun Jun 16 09:38:20 2013 -0700

    Merge "msm: camera: Added the NULL pointer check"

commit 9c88925c5fb06d105453353d720341952d9dd9bd
Merge: 4cf1ee0 6921d72
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Jun 15 21:47:41 2013 -0700

    Merge "msm: pm: add failed stats"

commit 4cf1ee05653a1c15100bb3cd79e781e96c552384
Merge: 84f9725 c202e7d
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Jun 15 04:33:38 2013 -0700

    Merge "msm: rpm: add debug msg for rpm outstanding req"

commit 84f9725b1275f91af2cb00258af7071f3caafcae
Merge: 4b2a0d9 8b65486
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Jun 15 02:04:19 2013 -0700

    Merge "msm: kgsl: Always resume the GPU regardless of its state"

commit 4b2a0d912edd1f6a732ee78ff6a49d4857e56822
Merge: 93baa42 4b1fec6
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Jun 15 02:03:57 2013 -0700

    Merge "wcnss: Prevent access to WCNSS driver after a failure"

commit 93baa4286a78dbac7bca38c7195bb135365f6ef2
Merge: c1449e4 8799b47
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Jun 15 02:03:56 2013 -0700

    Merge "wcnss: Add support to download calibrated data"

commit 6921d72db4ca7bba90334d21a7701b97c32c892d
Author: Venkat Devarasetty <vdevaras@codeaurora.org>
Date:   Sun May 19 16:36:48 2013 +0530

    msm: pm: add failed stats

    for idle and suspend failed cases the stats
    are not updated correctly, they are just added to
    success bucket.

    This patch is to log the failed stats separately.

    Change-Id: I4b290944e3f4b74ada13ef0ba51b812c83b5ec5d
    Signed-off-by: Venkat Devarasetty <vdevaras@codeaurora.org>

commit c202e7d45f756f3d174d17db3933a7817d0dd5b9
Author: Venkat Devarasetty <vdevaras@codeaurora.org>
Date:   Mon May 20 12:22:12 2013 +0530

    msm: rpm: add debug msg for rpm outstanding req

    added a debug info for showing the power collapse
    abort due to rpm outstanding request.

    Change-Id: Ifbc8054033b3cc86ccebc625b501ddb8b2670707
    Signed-off-by: Venkat Devarasetty <vdevaras@codeaurora.org>

commit 4b1fec61baab518656c599b4eb1fe78af356eeab
Author: Sameer Thalappil <sameert@codeaurora.org>
Date:   Fri May 31 14:01:25 2013 -0700

    wcnss: Prevent access to WCNSS driver after a failure

    Once the WCNSS driver trigger fails, the WCNSS platform driver main
    environment is set to NULL. Any further access to WCNSS platform driver
    should be prevented after this.

    Change-Id: I6d391a347a144c31b70db0fd74904e5d1e020692
    CRs-Fixed: 458741
    Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>

commit 8799b47f786b1a8beb59e876e9b5a4e3fff0ce84
Author: Sameer Thalappil <sameert@codeaurora.org>
Date:   Wed Apr 24 14:54:39 2013 -0700

    wcnss: Add support to download calibrated data

    WCNSS Firmware needs raw NV data (settings & some register values),
    to do the power-on calibration. Once firmware does the power-on
    calibration; it can then re-use the calibrated data. And it need not
    do the calibration again when the next time it boots. WCNSS sends this
    calibrated data to Apps; and Apps saves this into a persistent area.
    And in the subsequent bootup, Apps sends the calibrated data to WCNSS.

    Add interfaces to read calibrated data; and also add inteface to write
    calibrated data to platform driver.

    Change-Id: Ic18d40150093024b10a53e28f8a423dd9d3846eb
    CRs-Fixed: 458741
    Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>

commit c1449e4a593160c92812c8786fbfb1b04493a071
Merge: 1fdcb14 c6252a5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jun 14 09:46:09 2013 -0700

    Merge "board: 8930: Configure LDO17 as always_on only for 8930 SGLTE EVT1"

commit 1fdcb141b8987094c1306aec3b88042caad3ebe3
Merge: 46b00a5c 590be83
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jun 14 09:45:51 2013 -0700

    Merge "ASoC: wcd9304: recalibrate microphone ground voltage"

commit 46b00a5c870e6768e5b955adc8c87d2a675ff8ed
Merge: 027bb54 043c5e1
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jun 14 09:45:49 2013 -0700

    Merge "ASoC: wcd9304: Wait enough time during mbhc calibration"

commit 027bb54338d7c9a8dd02ce51b4b0c45ebd19b3a3
Merge: 712d161 e2a6f5f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jun 14 09:45:42 2013 -0700

    Merge "msm: msm_bus: Correct the return value from register-client"

commit 712d16110f446e59d8ee9464d4ebd71c2e4615e8
Merge: 561bc55 3dfc431
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jun 14 09:45:30 2013 -0700

    Merge "msm: rotator: Enable support for 2-pass fast YUV mode"

commit 37c104072ee11a3c766f74c35e855a5e949d5379
Author: Lakshmi Narayana Kalavala <lkalaval@codeaurora.org>
Date:   Wed Jun 12 10:36:53 2013 -0700

    msm:camera: Increase the v4l2 event queue length

    Observed missing of v4l2 events to userspace media controller,
    this can happen if media controller is blocked in post processing
    the frames. Hence increasing the queue length gives enough time
    to accomodate all the events without being overwritten with
    newer events.

    Change-Id: Ic3b5fd29df8c6384e83312b9c9ffd788bdf60951
    Signed-off-by: Lakshmi Narayana Kalavala <lkalaval@codeaurora.org>

commit 561bc5532d22ecf4a7026c4adece2626f4c92275
Merge: e55dc78 51d8066
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jun 14 02:47:27 2013 -0700

    Merge "msm: mdm2: Decrease leakage before QSC power-up"

commit c6252a5e210454a6e48295989ba05fdb1f6fa31c
Author: Prasad Sodagudi <psodagud@codeaurora.org>
Date:   Fri Jun 7 14:34:57 2013 +0530

    board: 8930: Configure LDO17 as always_on only for 8930 SGLTE EVT1

    LDO17 is the power source for a set of MSM gpios on 8930 SGLTE EVT1.
    So configure LDO17 as always_on only for 8930 SGLTE EVT1.

    CRs-Fixed: 500223
    Change-Id: Id09fb16d3f4cedcc7753b7ac276a405def8364a0
    Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>

commit e55dc78dacccdbdee779aee2cbf061a79c2099b4
Merge: 5d19ab9 7c9bd44
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jun 13 22:50:37 2013 -0700

    Merge "msm-camera: Fix for the Ov8825 HFR 60&120 FPS issue."

commit 51d8066738e867d92123895c0f0ff3138e332c89
Author: Taniya Das <tdas@codeaurora.org>
Date:   Mon Jan 21 15:14:15 2013 +0530

    msm: mdm2: Decrease leakage before QSC power-up

    Cleanup of IPC gpios for driver strength and toggle
    AP2MDM_STATUS only after AP2MDM_KPD_PWR is toggled, this
    will decrease the leakage from MSM to QSC before QSC
    powering up.

    CRs-Fixed: 460500
    Change-Id: Iabfa34331b613dd66577e485572a809440cf5272
    Signed-off-by: Taniya Das <tdas@codeaurora.org>
    (cherry picked from commit aa068dcefa45ec83709da39ab63844a9b83e9fc8)

    Conflicts:

    	arch/arm/mach-msm/mdm2.c
    	arch/arm/mach-msm/mdm_common.c

    Signed-off-by: Akhila Musunuri <makhila@codeaurora.org>

commit 5d19ab903e602ac1c62188ce677dd57aa8dbe36a
Merge: ff5184a 574613c
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jun 13 03:19:22 2013 -0700

    Merge "msm:camera: Fix signedness issue in hw_exec_cmds"

commit 590be8381cfee8fb673a287eb58329595aee14b3
Author: Simmi Pateriya <simmip@codeaurora.org>
Date:   Tue May 28 16:11:51 2013 +0530

    ASoC: wcd9304: recalibrate microphone ground voltage

    Different clock sources can affect mbhc voltage inconsistent measurement
    accumulation which consecutively results in inaccurate button detection.
    Recalibrate ground voltage on dce handler to enhance mbhc button detection
    accuracy.

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

commit 043c5e19c151132a812e4cc5f8e6180dd630e493
Author: Simmi Pateriya <simmip@codeaurora.org>
Date:   Tue May 28 15:58:03 2013 +0530

    ASoC: wcd9304: Wait enough time during mbhc calibration

    If mbhc micbias has a capacitor which is large enough to delay micbias
    voltage ramp up/down, initial calibration also needs to delay enough time
    after changing mux to be able to calibrate ground and micbias voltage
    accurately.  Increase delay to 50ms during calibration and improve
    calibration accuracy.

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

commit ff5184acf93bb3fa0c18f09947480ff5ee884d88
Merge: 3edc7a9 03fa842
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jun 12 12:31:42 2013 -0700

    Merge "mfd: pm8xxx-pwm: Set the correct bank if PWM is enabled without lut_config"

commit 03fa842da6e3b10cf47b354fdd7636f46b971f3e
Author: Prasad Sodagudi <psodagud@codeaurora.org>
Date:   Wed Jun 12 19:29:36 2013 +0530

    mfd: pm8xxx-pwm: Set the correct bank if PWM is enabled without lut_config

    In the cases where PWM lut_conig is not required, both PWM banks
    are not enabled. So set the correct bank if PWM is enabled without
    PWM lut_config.

    Change-Id: I2bbed2f055022689c5943e374ac99fce4387f663
    Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>

commit 56f461b7628a97df58b4a5ccb9fe48ce02531aa6
Author: Kiran Kumar H N <hurlisal@codeaurora.org>
Date:   Wed Jun 12 10:15:12 2013 +0530

    msm: gemini: Fix the size argument of hw_region_dump function.

    The size argument for the msm_gemini_hw_region_dump function is
    signed which is not correct, since the function operates on
    it as if it is unsigned. Change this to unsigned parameter.

    Change-Id: Icea70ad20b010651047b911e7b6ae57889e610e7
    Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>

commit 574613c86c6d0ade6d7ef40af2745f6c32ffce0d
Author: Monika Alekhya <malekh@codeaurora.org>
Date:   Tue Jun 11 19:32:27 2013 +0530

    msm:camera: Fix signedness issue in hw_exec_cmds

      In hw_exec_cmds()second argument m_cmds should be
      of type unsigned interger

    Change-Id: Idad2eb1a59481f3fe9f90221ff2061e8dae57013
    CRs-Fixed: 493314
    Signed-off-by: Monika Alekhya <malekh@codeaurora.org>

commit 2bd6b206461cddbd32a932d40f3efa20ad5faf48
Author: Vishnuvardhan Prodduturi <vproddut@codeaurora.org>
Date:   Wed Jun 12 14:44:21 2013 +0530

    msm: msm_fb: Add range checks for fb cmap.

    Add appropriate range checks to ensure valid access
    through framebuffer cmap. This prevents illegal
    access into memory.

    Change-Id: I9e82a27a2d12f31d8150ea577514576824f8b1f5
    Signed-off-by: Vishnuvardhan Prodduturi <vproddut@codeaurora.org>

commit 3edc7a9ca563702133b678063a6544dc3533a4df
Merge: 167e030 dfddf03
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jun 12 00:00:55 2013 -0700

    Merge "msm: camera: Return from DQBUF ioctl in case of error."

commit 7c9bd44d97ca55601a8b6cb31a1bd3d3c0beeeca
Author: Katta Santhisindhu <kattas@codeaurora.org>
Date:   Wed Jun 12 09:52:09 2013 +0530

    msm-camera: Fix for the Ov8825 HFR 60&120 FPS issue.

    In HFR case no need of calculating the frame length lines, we can
    consider fixed frame length lines.

    Change-Id: Ife485e5c6233763e4722626c47ee375263f8ef76
    CRs-Fixed: 491709
    Signed-off-by: Katta Santhisindhu <kattas@codeaurora.org>

commit 8b65486fe35838e4578cf99e20da4a5f01b46151
Author: Suman Tatiraju <sumant@codeaurora.org>
Date:   Thu May 30 03:41:21 2013 -0700

    msm: kgsl: Always resume the GPU regardless of its state

    Make sure we resume the GPU regardless of its current
    state. If the device is not in suspend state restart the
    device and  print an error message.

    Change-Id: I9e71cbe27d360dc06513c54f3a734aaea5b10d2b
    Signed-off-by: Suman Tatiraju <sumant@codeaurora.org>

commit cc2cce542202ac0461d6873ff345dfdaf1e30368
Merge: 4486d14 78e800d
Author: Wizard0f0s <jamie.gilmer@gmail.com>
Date:   Tue Jun 11 09:44:41 2013 -0400

    Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_kernel_samsung_d2 into cm-10.1

commit 78725fa84f400605ceaad7e769c72951fe125f23
Author: Roja Rani Yarubandi <rojay@codeaurora.org>
Date:   Tue Jun 11 17:29:43 2013 +0530

    msm: camera: Add mechanism to stop overflow recovery and handle IOMMU pagefault

    CRs-Fixed: 491200

    Change-Id: Ic148007e9402862060c3f4b6d7cc8f2b5c77ad9f
    Signed-off-by: Roja Rani Yarubandi <rojay@codeaurora.org>

commit 167e030b8ca64a86151a58a6b7ab39a84fbeb492
Merge: df4095a f1de558b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 11 01:06:06 2013 -0700

    Merge "msm: camera: Add state check for sensor power up & down"

commit df4095added38531141e47ec1fbd12c26244a881
Merge: 0e851ae 7acf4c1
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 11 01:05:55 2013 -0700

    Merge "msm: vidc: Handle mgen2maxi interrupt in video driver"

commit 0e851ae87c9301d2ee3cd08d35949edb32546341
Merge: 2e6e955 b0769af
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 11 01:05:47 2013 -0700

    Merge "leds: pm8xxx: Enable PWM LPG banks based on max current"

commit 2e6e95558cfe06b905746fe57445c6c074ef5222
Merge: ed59f64 2c7431e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 11 01:05:36 2013 -0700

    Merge "msm: display: Proper handling of prepare and unprepare clocks"

commit 731f15c68d7bc47fa5ddeee9c3ce1dc2d205396f
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Fri May 17 18:38:14 2013 -0400

    msm_fb: Increase base fence timeout

    The earlier value of 1 second caused unnecessary warnings on
    heavy workloads by the GPU.

    Change-Id: Ib4a5b098267251d5c63c4d8d2a2f51b339acc1d2
    Signed-off-by: Naseer Ahmed <naseer@codeaurora.org>
    Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>

commit ed59f646b48c1c02de8ddfb1c4627305ac928d19
Merge: 3ff21eb ad5a196
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 10 23:17:13 2013 -0700

    Merge "msm: vidc: Get the current performance level"

commit 3ff21eb1585a083e9b7a06f62ae037fced6b9e62
Merge: 88698f7 81b0164
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 10 23:16:58 2013 -0700

    Merge "msm_serial_hs: Use RFR GPIO to communicate remote uart"

commit 13285c5b7064f27f90eab376ee01f73fd12dfda3
Author: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Date:   Fri Apr 5 03:16:14 2013 +0100

    ARM: 7693/1: mm: clean-up in order to reduce to call kmap_high_get()

    In kmap_atomic(), kmap_high_get() is invoked for checking already
    mapped area. In __flush_dcache_page() and dma_cache_maint_page(),
    we explicitly call kmap_high_get() before kmap_atomic()
    when cache_is_vipt(), so kmap_high_get() can be invoked twice.
    This is useless operation, so remove one.

    v2: change cache_is_vipt() to cache_is_vipt_nonaliasing() in order to
    be self-documented

    Change-Id: I36e5a63fdae158d9e7562f564f7e593b351f6960
    Acked-by: Nicolas Pitre <nico@linaro.org>
    Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Git-commit: dd0f67f4747797f36f0c6bab7fed6a1f2448476d
    Git-repo: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/
    [Few merge conflict resolved]
    Signed-off-by: Chintan Pandya <cpandya@codeaurora.org>

commit ad5a1966fe2423143b713c4c0560415bfc1bea0a
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Wed May 22 04:25:29 2013 +0530

    msm: vidc: Get the current performance level

    This change supports client to get the current
    performance level of the video driver via
    IOCTL_GET_PERF_LEVEL. The current performance
    level indicate the number of MBs per second
    is being processed by video hardware.

    Change-Id: Ic6f5b2b14e0d77bf801c4f857f8a0e20339c199f
    Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>

commit 3dfc431913eca8a8d347c3069f6935c0fb7df9aa
Author: Padmanabhan Komanduru <pkomandu@codeaurora.org>
Date:   Fri Apr 12 17:22:00 2013 +0530

    msm: rotator: Enable support for 2-pass fast YUV mode

    Add support for 2-pass rotator operation for downscaling
    and 90 degree rotation when rotator operates in fast YUV
    mode. 2-pass is supported for 420 H2V2 formats.

    Change-Id: Ib8ce802a5a8aabe10c88422e3b8d82708c5b05d4
    Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>

commit 88698f7b75db87564090d5e97210288c2fd85a78
Merge: 7c97028 5760ce3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 10 04:21:34 2013 -0700

    Merge "media: dvb: Fix error handling of SDMX API failures"

commit 7c97028d6919b6d3c085b6cb86f0829996485a5f
Merge: 07dc263 5414a93
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 10 04:21:08 2013 -0700

    Merge "ASoC: msm: Add PCM loopback volume control"

commit 07dc26339acc5cceb0b53f27a9de4d32d83462bc
Merge: 8e5a2e3 f60ee6a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 10 04:21:07 2013 -0700

    Merge "ALSA: PCM: volume API implementation"

commit 78e800d2663cd3d1cf22dd5a235108c0b529a464
Author: Dan Pasanen <dan.pasanen@gmail.com>
Date:   Sun Jun 9 22:51:01 2013 -0500

    devices-8960: Fix camera failure with newer tz firmware

    Change-Id: I524ff7196d9f3ae268178826b986d5dcee1de88f

commit 6825d7994c38a71d77a10d281d56ee3a5640ecf6
Author: Dan Pasanen <dan.pasanen@gmail.com>
Date:   Sun Jun 9 22:51:01 2013 -0500

    devices-8960: Fix camera failure with newer tz firmware

    Change-Id: I524ff7196d9f3ae268178826b986d5dcee1de88f

commit 8e5a2e3e2637724d3cf7baabc9292c522560ce9c
Merge: 7c57805 5734ada
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sun Jun 9 21:10:20 2013 -0700

    Merge "rmnet_smux: Increase Rmnet device instance count"

commit 7c578051069e459f4749c9a8ae0c988887bd4a69
Merge: 27ad9db 515c325
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sun Jun 9 21:10:19 2013 -0700

    Merge "tty: smux_ctl: Add new SMUX port Support"

commit dfddf030fe7894a5ac07863391b024a5c8ca0cf6
Author: Kiran Kumar H N <hurlisal@codeaurora.org>
Date:   Sat Jun 8 18:53:00 2013 +0530

    msm: camera: Return from DQBUF ioctl in case of error.

    Incase the vb2_dqbuf call returns error, we are continuing
    ahead and trying to access the fields of the vb2 buffer which
    may not be initialized yet. Avoid this by checking the
    return value of vb2_dqbuf and return immediately in case of
    errors.

    Change-Id: I33036fe9b3bd7ce2b28e9cd6e4cd5f293425be95
    CRs-Fixed: 495635
    Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>

commit 27ad9db9e35a04bcc690170636dd48fb8aa3c87e
Merge: 24555a3 a5c3a3e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jun 7 12:36:43 2013 -0700

    Merge "msm_fb: hdmi: Return proper clock get error code"

commit 5734ada5b0fdb447d9b4c274d8532ce2e1650051
Author: Arun Kumar Neelakantam <aneela@codeaurora.org>
Date:   Fri Jun 7 14:11:05 2013 +0530

    rmnet_smux: Increase Rmnet device instance count

    Rmnet supports only one device instance.

    Increase Rmnet device instance count to enable dual PDN support.

    CRs-Fixed: 497343
    Change-Id: I1b3eacec4404ac72a524380a1fff39e6b257ade8
    Signed-off-by: Arun Kumar Neelakantam <aneela@codeaurora.org>

commit 515c32568d5a5bea200fcd4f37b1fc3d797f0ebf
Author: Arun Kumar Neelakantam <aneela@codeaurora.org>
Date:   Fri Jun 7 15:16:52 2013 +0530

    tty: smux_ctl: Add new SMUX port Support

    smux_ctl exposes only one control port to userspace. Enabling of dual
    PDN support requires two SMUX ports.

    Add new SMUX control port to enable dual PDN support.

    CRs-Fixed: 497343
    Change-Id: I2a1d48f1e5d2acd1f67d7673d325c4360b783cf4
    Signed-off-by: Arun Kumar Neelakantam <aneela@codeaurora.org>

commit 24555a39f03baf35b3a98ea21bedbf5a9102444f
Merge: 0c98e5d 0b435ff
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jun 7 04:07:30 2013 -0700

    Merge "usb: chipidea: udc: fix memory access of shared memory on armv5 machines"

commit 972cfe025c1abfedf9014d849eed06677e55baba
Author: manish gotefode <mgote@codeaurora.org>
Date:   Fri Jun 7 16:00:44 2013 +0530

    msm: camera: Added the NULL pointer check

    Added the NULL pointer check for isp_config
    to avoid the crashes

    Change-Id: I2df7eeb5c633b04c3aac5d985cf50c2ece7f1076
    CRs-Fixed: 495652
    Signed-off-by: manish gotefode <mgote@codeaurora.org>

commit 0c98e5df3cf2d69123849051f17377905735c30a
Merge: 6faa54a 6200a97
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jun 7 01:46:18 2013 -0700

    Merge "msm: ipc: Load default subsystem under appropriate scenario"

commit 6faa54a741821938a8b36645d0f778baa2b0035b
Merge: 6777e69 9088044
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jun 7 01:46:17 2013 -0700

    Merge "msm: ipc: Do not load any subsystem by default"

commit 6777e69a6cdf3ed536e3c2acc7479e7c98bd941d
Merge: f5b1cdd 12bc403
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jun 7 01:46:06 2013 -0700

    Merge "timer: Don't reinitialize the cpu base lock during CPU_UP_PREPARE"

commit f5b1cdd85ddb12b616e13f59470c652d709d5a0f
Merge: aaaeb30 51aa201
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jun 7 01:45:54 2013 -0700

    Merge "diag: Fix diag crash due to memory corruption"

commit 5760ce30a1249c282b32a4474196e56a81ed57e5
Author: Hamad Kadmany <hkadmany@codeaurora.org>
Date:   Fri Jun 7 10:14:19 2013 +0300

    media: dvb: Fix error handling of SDMX API failures

    When setting of key-ladder index fails, there's no need
    to fail starting of the filter since it could only mean
    that decryption might fail if encrypted packets are encountered.

    In addition, if closing SDMX session fails, SDMX TZ application
    might be removed anyhow, therefore we should clear reference
    counting of SDMX session so that it is re-opened if requested
    in the future.

    Change-Id: I17e1ce62b72910e2086d948807af969725c6f18b
    Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>

commit 0b435ff6d48a45c40bd0e0264d9e1fe5f08b33eb
Author: Michael Grzeschik <m.grzeschik@pengutronix.de>
Date:   Thu Apr 4 13:13:46 2013 +0300

    usb: chipidea: udc: fix memory access of shared memory on armv5 machines

    The udc uses an shared dma memory space between hard and software. This
    memory layout is described in ci13xxx_qh and ci13xxx_td which are marked
    with the attribute ((packed)).

    The compiler currently does not know about the alignment of the memory
    layout, and will create strb and ldrb operations.

    The Datasheet of the synopsys core describes, that some operations on
    the mapped memory need to be atomic double word operations. I.e. the
    next pointer addressing in the qhead, as otherwise the hardware will
    read wrong data and totally stuck.

    This is also possible while working with the current active td queue,
    and preparing the td->ptr.next in software while the hardware is still
    working with the current active td which is supposed to be changed:

    writeb(0xde, &td->ptr.next + 0x0); /* strb */
    writeb(0xad, &td->ptr.next + 0x1); /* strb */

    <----- hardware reads value of td->ptr.next and get stuck!

    writeb(0xbe, &td->ptr.next + 0x2); /* strb */
    writeb(0xef, &td->ptr.next + 0x3); /* strb */

    This appeares on armv5 machines where the hardware does not support
    unaligned 32bit operations.

    This patch adds the attribute ((aligned(4))) to the structures to tell
    the compiler to use 32bit operations. It also adds an wmb() for the
    prepared TD data before it gets enqueued into the qhead.

    CRs-Fixed: 494323
    Change-Id: I3fc2e0f662076572d61f97ed708026be3cd3e59c
    Cc: stable <stable@vger.kernel.org> # v3.5
    Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
    Reviewed-by: Felipe Balbi <balbi@ti.com>
    Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Git-commit: a9c174302b1590ef3ead485d804a303c5f89174b
    Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
    [pkondeti@codeaurora.org: resolved merge conflicts]
    Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>

commit 6200a9729aee00a0f2707057fed26981f80e4e95
Author: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
Date:   Mon Jun 3 12:05:50 2013 -0600

    msm: ipc: Load default subsystem under appropriate scenario

    Only client and service ports are used for communication with the remote
    subsystems. Load the default subsystem only when the clients lookup their
    services or when the local services get registered with the IPC Router.

    CRs-Fixed: 480156
    Change-Id: I18729bb849c656a826de4f67f9ffe159dd3cf5f6
    Signed-off-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>

commit 9088044d9d1084c1376d7d3d9aeba444e91cacf9
Author: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
Date:   Wed Apr 24 18:01:37 2013 -0600

    msm: ipc: Do not load any subsystem by default

    Some users of IPC Router like IPC Router Security Configuration (IRSC)
    open up a socket, perform some configuration/lookup operation quickly and
    then close the socket. This causes the IPC Router to load a subsystem by
    default and then unload it immediately. This behavior causes the subsystem
    to lock up sometimes during the boot process.

    Remove loading and unloading a subsystem by default during the socket
    create and close operation.

    CRs-Fixed: 480156
    Change-Id: I9c1c01c18a538a462bcf65902e496bc773a03991
    Signed-off-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>

commit 7acf4c10fcdf7e530bb4b1dadb32532b97339b6a
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Thu Jun 6 19:23:50 2013 +0530

    msm: vidc: Handle mgen2maxi interrupt in video driver

    Handle interrupt generated by mgen2maxi h/w and
    avoid unknown interrupts storm which results in
    target reset issues.

    Change-Id: Ida24cb2dde15c9cd4a4c1d9ca336b1a4b662c4d1
    Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>

commit a5cab2452cdc401d04abfc1f9f89ad79b7c771b2
Author: desterly <d3s7royer@gmail.com>
Date:   Thu Jun 6 08:32:09 2013 -0400

    d2: Squashed revert of msm_serial_hs.c updates

    Reverts d0351295f9774e837d9bd05469ba90a0bac77667 and 9fcb8efb0242207c91e8fe1179f806ae2fb6fb1b

    Commit 9fcb8efb0242207c91e8fe1179f806ae2fb6fb1b is causing issues with Bluetooth issues on d2 devices (d2vzw primarily)

    - Pairing issues with pair failures
    - Handshaking issues after pairing with device timing out or numerious retry to connect
    - Disconnect issues - lack of reconnecting issues

    Revert confirms fix on d2vzw

    Change-Id: I88df917560a7cfe03ff5da6e54c9af89bba6962b

commit aaaeb304e6813bebd8a5e27ad491d9a916171639
Merge: aca81c2 b4eb60f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jun 6 05:00:32 2013 -0700

    Merge "msm: pm: send notification only for SPC and PC"

commit aca81c2a1f638bee78b476481113ae3c777faf81
Merge: 1872a30 73bc890
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jun 6 05:00:11 2013 -0700

    Merge "msm_fb: Correct R and G offsets for correct mapping"

commit 1872a30c01fd94bca29169fd562e4a4b1e44a292
Merge: 6ee26e2 4375812
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jun 6 05:00:04 2013 -0700

    Merge "msm: audio: qdsp6v2: Fix for kernel crash during stability"

commit 12bc403e965834d97d72c3d2b7502b6d3f3de770
Author: Tirupathi Reddy <tirupath@codeaurora.org>
Date:   Tue Apr 23 20:25:55 2013 +0530

    timer: Don't reinitialize the cpu base lock during CPU_UP_PREPARE

    An inactive timer's base can refer to a offline cpu's base.

    In the current code, cpu_base's lock is blindly reinitialized
    each time a CPU is brought up. If a CPU is brought online
    during the period that another thread is trying to modify an
    inactive timer on that CPU with holding its timer base lock,
    then the lock will be reinitialized under its feet. This leads
    to following SPIN_BUG().

    <0> BUG: spinlock already unlocked on CPU#3, kworker/u:3/1466
    <0> lock: 0xe3ebe000, .magic: dead4ead, .owner: kworker/u:3/1466,
     .owner_cpu: 1
    <4> [<c0013dc4>] (unwind_backtrace+0x0/0x11c) from [<c026e794>]
    (do_raw_spin_unlock+0x40/0xcc)
    <4> [<c026e794>] (do_raw_spin_unlock+0x40/0xcc) from [<c076c160>]
    (_raw_spin_unlock+0x8/0x30)
    <4> [<c076c160>] (_raw_spin_unlock+0x8/0x30) from [<c009b858>]
    (mod_timer+0x294/0x310)
    <4> [<c009b858>] (mod_timer+0x294/0x310) from [<c00a5e04>]
    (queue_delayed_work_on+0x104/0x120)
    <4> [<c00a5e04>] (queue_delayed_work_on+0x104/0x120) from [<c04eae00>]
    (sdhci_msm_bus_voting+0x88/0x9c)
    <4> [<c04eae00>] (sdhci_msm_bus_voting+0x88/0x9c) from [<c04d8780>]
    (sdhci_disable+0x40/0x48)
    <4> [<c04d8780>] (sdhci_disable+0x40/0x48) from [<c04bf300>]
    (mmc_release_host+0x4c/0xb0)
    <4> [<c04bf300>] (mmc_release_host+0x4c/0xb0) from [<c04c7aac>]
    (mmc_sd_detect+0x90/0xfc)
    <4> [<c04c7aac>] (mmc_sd_detect+0x90/0xfc) from [<c04c2504>]
    (mmc_rescan+0x7c/0x2c4)
    <4> [<c04c2504>] (mmc_rescan+0x7c/0x2c4) from [<c00a6a7c>]
    (process_one_work+0x27c/0x484)
    <4> [<c00a6a7c>] (process_one_work+0x27c/0x484) from [<c00a6e94>]
    (worker_thread+0x210/0x3b0)
    <4> [<c00a6e94>] (worker_thread+0x210/0x3b0) from [<c00aad9c>]
    (kthread+0x80/0x8c)
    <4> [<c00aad9c>] (kthread+0x80/0x8c) from [<c000ea80>]
    (kernel_thread_exit+0x0/0x8)

    As an example, this particular crash occurred when CPU #3 is executing
    mod_timer() on an inactive timer whose base is refered to offlined CPU #2.
    The code locked the timer_base corresponding to CPU #2. Before it could
    proceed, CPU #2 came online and reinitialized the spinlock corresponding
    to its base. Thus now CPU #3 held a lock which was reinitialized. When
    CPU #3 finally ended up unlocking the old cpu_base corresponding to CPU #2,
    we hit the above SPIN_BUG().

    CPU #0			CPU #3				       CPU #2
    ------			-------				       -------
    .....			 ......				      <Offline>
    			mod_timer()
    			 lock_timer_base
    			  spin_lock_irqsave(&base->lock)

    cpu_up(2)		 .....				        ......
    							 init_timers_cpu()
    .....		 	 spin_unlock_irqrestore(&base->lock)     ......
    			   <spin_bug>

    Allocation of per_cpu timer vector bases is done only once under
    "tvec_base_done[]" check. In the current code, spinlock_initialization
    of base->lock isn't under this check. When a CPU is up each time the base
    lock is reinitialized. Move base spinlock initialization under the check.

    CRs-Fixed: 471127
    Change-Id: I73b48440fffb227a60af9180e318c851048530dd
    Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>

commit b0769afac7e5a67398a892bb78dddd9d1675d31d
Author: Prasad Sodagudi <psodagud@codeaurora.org>
Date:   Fri May 31 12:37:53 2013 +0530

    leds: pm8xxx: Enable PWM LPG banks based on max current

    The current design enables PWM LPG high bank with out
    checking the max current. So enable PWM LPG low bank when max
    current configured as 4mA and enable PWM LPG high bank when
    the max current configured as 8mA. Enabled both PWM LPG low bank
    and PWM LPG high bank when max current configure as 12mA.

    CRs-Fixed: 486318
    Change-Id: I6686ed85d78fa55f08491a47c10581407e0cd70e
    Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>

commit edac7c761b8e64e758d578b1d03df4b8846819c4
Author: Bruno Randolf <br1@einfach.org>
Date:   Fri Apr 19 14:27:36 2013 -0500

    bcmdhd: Enable Ad-Hoc (IBSS) mode

    Enable Ad-Hoc (IBSS) mode for bcmdhd. We basically just need to set the
    interface flag and avoid some P2P specific settings while scanning.

    Also add the "station get" command for IBSS mode.

    Change-Id: Ie6f0fa77b55d92a7c22cbda72bad200cbfaede04
    Signed-off-by: Bruno Randolf <br1@einfach.org>

    Change-Id: I598c6d832cfd3dcc0ddbfb5dc29f29cb97cdbd8b

commit c13156a9d2266cf7ffa97d8278d23461b91b45c3
Author: Dan Pasanen <dan.pasanen@gmail.com>
Date:   Fri Apr 19 13:56:04 2013 -0500

    net: bcmdhd: update to version 1.61.47 from the GT-9505 source drop

    Change-Id: Ib21e86c4652be47c69aeaa5c22f93676962e6354

commit 9fc0b2c064f612f493dcbb123a0d36967ab1c851
Author: Bruno Randolf <br1@einfach.org>
Date:   Fri Apr 19 14:27:36 2013 -0500

    bcmdhd: Enable Ad-Hoc (IBSS) mode

    Enable Ad-Hoc (IBSS) mode for bcmdhd. We basically just need to set the
    interface flag and avoid some P2P specific settings while scanning.

    Also add the "station get" command for IBSS mode.

    Change-Id: Ie6f0fa77b55d92a7c22cbda72bad200cbfaede04
    Signed-off-by: Bruno Randolf <br1@einfach.org>

    Change-Id: I598c6d832cfd3dcc0ddbfb5dc29f29cb97cdbd8b

commit e3559939139593a724ddd60818fafcba64070890
Author: Dan Pasanen <dan.pasanen@gmail.com>
Date:   Fri Apr 19 13:56:04 2013 -0500

    net: bcmdhd: update to version 1.61.47 from the GT-9505 source drop

    Change-Id: Ib21e86c4652be47c69aeaa5c22f93676962e6354

commit 7c32bb421bff4c7247ccbef406139d9a17cd396a
Merge: 23e3784 144b626
Author: Shareef Ali <shareefalis@cyanogenmod.org>
Date:   Wed Jun 5 21:11:07 2013 -0700

    Merge "ARM: mutex: use generic atomic_dec-based implementation for ARMv6+" into cm-10.1

commit f4a4c5ec3ce158b7aef5a3019c09a6a3f0075bd5
Author: Steve Kondik <shade@chemlab.org>
Date:   Wed Jun 5 22:27:05 2013 -0400

    Revert "msm: mdp: Revert MDP Port split changes"

    This reverts commit f5cac71257887b1cc28a49ab93a53eb2a7f6780c.

commit 89a910c58a260bdb4a989513ddc4a029c1618533
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat Jun 1 06:27:44 2013 -0700

    d2: Enable low-latency audio device

     * This is working after the recent firmware update!

    Change-Id: I491234fe39f53db49e2eaac6912c29953b323677

commit 29f2d74180fe22aa777b4c1522bb40f3702bce05
Author: Tatyana Brokhman <tlinder@codeaurora.org>
Date:   Thu May 16 14:36:58 2013 +0300

    block: Remove "requeuing urgent req" error messages

    It is possible for URGENT request to be requeued/reinserted if it was
    fetched during the creation of a packed list. This end case is rare and is
    not handled at the moment.
    This patch changes the messages notifying of the above to debug level
    (instead of error) in order to clear the dmesg log.

    Change-Id: Ie8bc067e61559a6f702077b95c5dbcc426404232
    Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

commit 7b6d7d0e2b403cce8b52ba8a9199584e2da7526e
Author: Srivatsa Vaddagiri <vatsa@codeaurora.org>
Date:   Mon May 13 15:11:55 2013 -0700

    sched: fix reference to wrong cfs_rq

    Commit 7db16c8c (sched: Fix SCHED_HRTICK bug leading to late preemption
    of tasks) introduced a bug in sched_slice() calculation by using wrong
    cfs_rq for tasks. rq->cfs was incorrectly used as task's cfs_rq, rather
    than the correct one to which they belonged.

    Fix the bug by using correct cfs_rq for tasks.

    Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>

commit e61eedcfa8d13ee1d91d74d01b0f4c850b4c467e
Author: Mahesh Sivasubramanian <msivasub@codeaurora.org>
Date:   Fri May 10 09:38:51 2013 -0600

    msm: cpufreq: Configure WQ for higer priority

    When the workqueue runs at a lower priority, it gets starved by higher
    priority threads. Bump the WQ priority to high to ensure cpufreq work
    queue gets a fair scheduling chance

    Change-Id: I9e994da94a347dceb884e72ec3dd3da468a4471d
    Signed-off-by: Mahesh Sivasubramanian <msivasub@codeaurora.org>

commit 98cc963275819476fafdbce63e755a8aae5cfe89
Author: Mahesh Sivasubramanian <msivasub@codeaurora.org>
Date:   Fri May 10 09:38:51 2013 -0600

    msm: rpm-smd: Configure WQ for higer priority

    When the workqueue runs at a lower priority, it gets starved by higher
    priority threads. Bump the WQ priority to high to ensure rpm smd work
    queue gets a fair chance

    Change-Id: I06b864611cf45afe6931d6030327806032894663
    Signed-off-by: Mahesh Sivasubramanian <msivasub@codeaurora.org>

commit ba0a25a5c4ba3ab2c61486a316075c1827d4f41f
Author: Tejun Heo <tj@kernel.org>
Date:   Fri Jul 13 22:16:45 2012 -0700

    workqueue: reimplement WQ_HIGHPRI using a separate worker_pool

    WQ_HIGHPRI was implemented by queueing highpri work items at the head
    of the global worklist.  Other than queueing at the head, they weren't
    handled differently; unfortunately, this could lead to execution
    latency of a few seconds on heavily loaded systems.

    Now that workqueue code has been updated to deal with multiple
    worker_pools per global_cwq, this patch reimplements WQ_HIGHPRI using
    a separate worker_pool.  NR_WORKER_POOLS is bumped to two and
    gcwq->pools[0] is used for normal pri work items and ->pools[1] for
    highpri.  Highpri workers get -20 nice level and has 'H' suffix in
    their names.  Note that this change increases the number of kworkers
    per cpu.

    POOL_HIGHPRI_PENDING, pool_determine_ins_pos() and highpri chain
    wakeup code in process_one_work() are no longer used and removed.

    This allows proper prioritization of highpri work items and removes
    high execution latency of highpri work items.

    v2: nr_running indexing bug in get_pool_nr_running() fixed.

    v3: Refreshed for the get_pool_nr_running() update in the previous
        patch.

    Change-Id: Id843c0a425f51f84083786fbf413d999d35771b7
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Reported-by: Josh Hunt <joshhunt00@gmail.com>
    LKML-Reference: <CAKA=qzaHqwZ8eqpLNFjxnO2fX-tgAOjmpvxgBFjv6dJeQaOW1w@mail.gmail.com>
    Cc: Tony Luck <tony.luck@intel.com>
    Cc: Fengguang Wu <fengguang.wu@intel.com>
    Git-commit: 3270476a6c0ce322354df8679652f060d66526dc
    Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
    Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

commit f0eb249d0461a8ef1d8f3b44dc183843e2debf3e
Author: Tejun Heo <tj@kernel.org>
Date:   Fri Jul 13 22:16:44 2012 -0700

    workqueue: introduce NR_WORKER_POOLS and for_each_worker_pool()

    Introduce NR_WORKER_POOLS and for_each_worker_pool() and convert code
    paths which need to manipulate all pools in a gcwq to use them.
    NR_WORKER_POOLS is currently one and for_each_worker_pool() iterates
    over only @gcwq->pool.

    Note that nr_running is per-pool property and converted to an array
    with NR_WORKER_POOLS elements and renamed to pool_nr_running.  Note
    that get_pool_nr_running() currently assumes 0 index.  The next patch
    will make use of non-zero index.

    The changes in this patch are mechanical and don't caues any
    functional difference.  This is to prepare for multiple pools per
    gcwq.

    v2: nr_running indexing bug in get_pool_nr_running() fixed.

    v3: Pointer to array is stupid.  Don't use it in get_pool_nr_running()
        as suggested by Linus.

    Change-Id: I46e9488601d764d25e4a6c707de129ab68f7064c
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Tony Luck <tony.luck@intel.com>
    Cc: Fengguang Wu <fengguang.wu@intel.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Git-commit: 4ce62e9e30cacc26885cab133ad1de358dd79f21
    Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
    Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

commit 3f37b0c3f634db59ca737a35242a8973c1194130
Author: Tejun Heo <tj@kernel.org>
Date:   Thu Jul 12 14:46:37 2012 -0700

    workqueue: separate out worker_pool flags

    GCWQ_MANAGE_WORKERS, GCWQ_MANAGING_WORKERS and GCWQ_HIGHPRI_PENDING
    are per-pool properties.  Add worker_pool->flags and make the above
    three flags per-pool flags.

    The changes in this patch are mechanical and don't caues any
    functional difference.  This is to prepare for multiple pools per
    gcwq.

    Change-Id: I1824fd1c509d8ac6b0619536621a22b15b316256
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Git-commit: 11ebea50dbc1ade5994b2c838a096078d4c02399
    Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
    Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

commit d85725fb7d5e13fd46ad498e286a89a9a36e6d37
Author: Tejun Heo <tj@kernel.org>
Date:   Thu Jul 12 14:46:37 2012 -0700

    workqueue: use @pool instead of @gcwq or @cpu where applicable

    Modify all functions which deal with per-pool properties to pass
    around @pool instead of @gcwq or @cpu.

    The changes in this patch are mechanical and don't caues any
    functional difference.  This is to prepare for multiple pools per
    gcwq.

    Change-Id: I4be6727e1cce6f9aa2a0057b96bdc725c84f1ea8
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Git-commit: 63d95a9150ee3bbd4117fcd609dee40313b454d9
    Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
    Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

commit 96c92d8299ee7c552a385d26c9d2cb31c1eba0d5
Author: Tejun Heo <tj@kernel.org>
Date:   Thu Jul 12 14:46:37 2012 -0700

    workqueue: factor out worker_pool from global_cwq

    Move worklist and all worker management fields from global_cwq into
    the new struct worker_pool.  worker_pool points back to the containing
    gcwq.  worker and cpu_workqueue_struct are updated to point to
    worker_pool instead of gcwq too.

    This change is mechanical and doesn't introduce any functional
    difference other than rearranging of fields and an added level of
    indirection in some places.  This is to prepare for multiple pools per
    gcwq.

    v2: Comment typo fixes as suggested by Namhyung.

    Change-Id: Iefae84798c2af580f425b92ed79117935d99f21f
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Git-commit: bd7bdd43dcb81bb08240b9401b36a104f77dc135
    Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
    Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

commit 823e773751f3937dc73ff658b1cf5d061d8a918d
Author: Tejun Heo <tj@kernel.org>
Date:   Thu Jul 12 14:46:37 2012 -0700

    workqueue: don't use WQ_HIGHPRI for unbound workqueues

    Unbound wqs aren't concurrency-managed and try to execute work items
    as soon as possible.  This is currently achieved by implicitly setting
    %WQ_HIGHPRI on all unbound workqueues; however, WQ_HIGHPRI
    implementation is about to be restructured and this usage won't be
    valid anymore.

    Add an explicit chain-wakeup path for unbound workqueues in
    process_one_work() instead of piggy backing on %WQ_HIGHPRI.

    Change-Id: Iecd17a9935ee28f856d8b726bb4c296762922bed
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Git-commit: 974271c485a4d8bb801decc616748f90aafb07ec
    Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
    Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

commit 3a625ce23d686990b7f6b0ecc087f4264d18d601
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat Jun 1 01:50:50 2013 -0700

    Revert "Revert "ASoC: msm: Support independent left-right channel volume control""

    This reverts commit 662675fe2fe42d6e0a4c66bebaf61cdca60c56bb.

commit 17039779eb85d7729680b22e30b4ebc8b7325ec4
Merge: 23e3784 7fc5534
Author: Steve Kondik <shade@chemlab.org>
Date:   Wed Jun 5 22:23:36 2013 -0400

    Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.351' of git://codeaurora.org/kernel/msm into cm-10.1

    AU_LINUX_ANDROID_JB_2.5.04.02.02.040.351 based on quic/aosp/jb_2.5

    Change-Id: I3d6e49f4e722ce0377af7c89cb3e35dce352d64e

commit 6ee26e24ad545e6e388fbfb3d62c9c792bb6480d
Merge: 369026a 896ca9f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jun 5 17:19:00 2013 -0700

    Merge "msm: mdm: change where ssr_count is decremented"

commit 51aa20136988e5e0dc13bf66fbdc7fc6d1bea980
Author: Ashay Jaiswal <ashayj@codeaurora.org>
Date:   Wed Jun 5 13:24:38 2013 +0530

    diag: Fix diag crash due to memory corruption

    Diag allocates memory based on the count received from userspace.
    Add check to validate the memory pointer before derefencing it.

    CRs-Fixed: 487981
    Change-Id: Ibfee22d02bb2312192de7c811d9917ecab728269
    Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>

commit 369026ab83f160309b1b8252d6db547009a89b92
Merge: 7fc5534 26cffa1
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 4 22:36:16 2013 -0700

    Merge "ASoC: WCD9304: Add the compander support to wcd9304"

commit 866c90f25d98afaf4b7c65b82892292f4e2486d8
Author: Nishant Pandit <npandit@codeaurora.org>
Date:   Wed Jun 5 07:28:21 2013 +0530

    msm: camera: Optimize the live snapshot state machine

    Send the ack for live snapshot done event once its
    completed instead of waiting for stop request from
    user. This helps in saving a wait time which could
    be upto 2 frame time in worst case

    Change-Id: Ibbef211512e4b9f06ff6b8d3ca52d1dc591c0b46
    Signed-off-by: Nishant Pandit <npandit@codeaurora.org>

commit b4eb60fcdbac7325f1515fa459f39c39661ac604
Author: Venkat Devarasetty <vdevaras@codeaurora.org>
Date:   Mon Jun 3 16:15:48 2013 +0530

    msm: pm: send notification only for SPC and PC

    Today the pm notification is sent for all the power
    modes of each CPU. This is not necessary for shallow
    power modes.

    This change is to send the notification for only
    standalone power collapse for each core and idle
    power collapse of core0.

    Change-Id: I9b3df3d72e43d645387c94b1b9c5da3bcf2f2e5f
    Signed-off-by: Venkat Devarasetty <vdevaras@codeaurora.org>

commit 7fc5534da4f340239fe8a36e48ef9554ca10519a
Merge: 7e54afe 908f5de
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 4 06:23:40 2013 -0700

    Merge "msm: rotator: Add proper checks for enabling Fast YUV"

commit 7e54afe1c36956822060585f49ea1283e49bb450
Merge: 583ddda 68cc30e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 4 06:23:20 2013 -0700

    Merge "msm: camera: Update op_pixel_clk for ov9724 sensor."

commit 583dddaa23f709c3b05dc2771c2542031cfa79fc
Merge: 941249c 6fd4d95
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 4 04:31:06 2013 -0700

    Merge "arm: board-8930-pmic: Pass WLED compensation resistor value"

commit 941249c36ee109f4ec3694976f646f55e2978d35
Merge: 4e6ad69 c86ceac
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 4 04:31:04 2013 -0700

    Merge "led: leds-pm8xxx: Add support to control compensation resistor"

commit 4e6ad69411b34e89e794812b6d75fa9612e7217b
Merge: 9d76add 5f43c9e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 4 04:30:37 2013 -0700

    Merge "msm_fb: display: change TE simulation and read pointer interrupt timing"

commit 908f5de5d9a819b5028bb4d0f155cdf596ae1fb1
Author: Padmanabhan Komanduru <pkomandu@codeaurora.org>
Date:   Fri May 31 14:18:24 2013 +0530

    msm: rotator: Add proper checks for enabling Fast YUV

    For rotator version 2.0 and above, there is support for fast
    YUV which gives better rotator performance. However, there are
    few constraints related to height under which fast YUV cannot be
    enabled when 90 degree rotation is enabled. Make sure
    to add proper checks before enabling fast YUV.

    Change-Id: Iafd204a6e4ef09e1151d01d8fde35359b7c3b7a5
    Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>

commit 81b0164d7c98c3d731654ce42b912e3d16a51f88
Author: Mayank Rana <mrana@codeaurora.org>
Date:   Tue Jun 4 14:13:02 2013 +0530

    msm_serial_hs: Use RFR GPIO to communicate remote uart

    CTS and RFR GPIOs are used for hardware flow control between
    two uarts. RFR GPIO provides current status of uart receiver
    to remote uart and based on this remote uart sends data.
    Hence use this functionality to prevent remote uart to send
    data when port is being opened, baud rate change operation
    is in progress and port is being closed.

    This change also set UART_DM_MR2 (Bit: 8 and 9) before
    configuring connected UART GPIOs to prevent RX_BREAK character
    and any character having PARTIY or FRAMING error which can be
    generated due to configuration of those GPIOs. Allows those
    character once port is opened successfuly.

    This change also zeroed uart rx software buffer which would
    help to see how many bytes copied by ADM from received data
    with UART RX FIFO to this memory. This would be useful if
    there is any Rx Stall issue is seen.

    CRs-Fixed: 495564
    Change-Id: I69382994356073c4c86f205015503c935ad09e8d
    Signed-off-by: Mayank Rana <mrana@codeaurora.org>

commit 68cc30e05b1ba29fe6beef4b49b530c1dbb94796
Author: Kiran Kumar H N <hurlisal@codeaurora.org>
Date:   Mon Jun 3 14:40:20 2013 +0530

    msm: camera: Update op_pixel_clk for ov9724 sensor.

    The op_pixel_clk for ov9724 sensor is not updated properly.
    Since this decices the VFE clock while using this sensor,
    this leads to violation errors from VFE especially during zoom.
    Adjust the clk such that VFE clock is upgraded accordingly.

    CRs-Fixed: 495462
    Change-Id: Ice1bb722143ef24982b5ba7c5e528235bc779123
    Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>

commit 2c7431e1a6dd58da160207f147a7d41a2c155542
Author: Sangani Suryanarayana Raju <csuryan@codeaurora.org>
Date:   Mon May 27 20:26:55 2013 +0530

    msm: display: Proper handling of prepare and unprepare clocks

    This change handles prepare and unprepare clocks properly to
    fix clock mismatches.

    Change-Id: I09986aa1f0e1a5be2e07655a1db0d23760dd0725
    Signed-off-by: Sangani Suryanarayana Raju <csuryan@codeaurora.org>

commit 9d76add01c8479fb774e463961a02d8a86387388
Merge: 5836ea7 23039dd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 3 23:27:32 2013 -0700

    Merge "media: dvb: Fix parsing of SDMX results"

commit 5836ea75caa2ac6a232e73c7349b370bcc39d2d4
Merge: 82eaff5 bc0c1c2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 3 23:27:31 2013 -0700

    Merge "media: dvb: Fix race condition in DVR thread"

commit 82eaff5cff086a11adcf98487e6a8534afb3a285
Merge: 0d1c4d8 5fa7bf0
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 3 23:27:29 2013 -0700

    Merge "media: dvb: Add initialization of PES error indicators"

commit 43758126ba8d5c3bc8ed5383c51afb10b935ea4a
Author: Deepa Madiregama <dmadireg@codeaurora.org>
Date:   Tue May 28 12:19:32 2013 +0530

    msm: audio: qdsp6v2: Fix for kernel crash during stability

    - Userspace calling AYSN_READ during flush, READ_DONE ack for
      this is coming after FLUSH_DONE which is hitting BUG_ON as
      buffers are removed from in_queue/out_queue during flush.
    - Fix is to avoid sending READ requests to DSP until flush
      is complete.

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

commit 23039ddf8d922ceec434a07988cefdbde2c60dc8
Author: Hamad Kadmany <hkadmany@codeaurora.org>
Date:   Mon Jun 3 09:56:42 2013 +0300

    media: dvb: Fix parsing of SDMX results

    When playing from memory, it may happen that demux thread
    is stalled while parsing SDMX results due to PULL mode.
    While thread is stalled it is possible that user asked to
    add new filter and therefore the SDMX filter count increases.

    When thread gets back from stalling, it may parse additional
    filters result even-though they were not processed by SDMX yet,
    hence parsing un-initialized data.

    Change-Id: Idb9430ec07f5869585ed1ae9ab3d43c4d31ff4d2
    Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>

commit 0d1c4d8396071dd13d461d4834b97ea22b876ed9
Merge: 77b039a e624587
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Jun 1 05:23:48 2013 -0700

    Merge "u_ether: Handle memory allocation failure case on tx path"

commit 73bc890c4fad51008bad6884ac6e127927bd1008
Author: Jeevan Shriram <jshriram@codeaurora.org>
Date:   Sat Jun 1 13:46:23 2013 +0530

    msm_fb: Correct R and G offsets for correct mapping

    R and G colors are swapped when ARGC test cases are executed.
    Correct the color mapping to right register offset to fix
    the color swapping issue.

    CRs-Fixed: 491215

    Change-Id: I4997acce577bdbbdf39e22502a678dbecf0bfc37
    Signed-off-by: Jeevan Shriram <jshriram@codeaurora.org>

commit 77b039a1a629f012e351b0a651455e73af31c43b
Merge: 036a6b35 a447653
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri May 31 16:41:53 2013 -0700

    Merge "defconfig: wcnss: Enable wcnss pre-alloc memory"

commit 036a6b3597c4d2899777f1055f3fd7249a82ecaa
Merge: 455caec 965a359
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri May 31 16:41:52 2013 -0700

    Merge "wcnss: Pre-alloc memory for WLAN driver"

commit 455caecfd533f878164cd527c6b0542f581c72b1
Merge: 8f0a5d5 13e6d4f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri May 31 12:08:40 2013 -0700

    Merge "power: pm8921-bms: Update the FCC learning algorithm"

commit 6fd4d950b5843ed08d0d74b169b8aab41ef1e97f
Author: Shantanu Jain <shjain@codeaurora.org>
Date:   Wed May 29 16:19:40 2013 +0530

    arm: board-8930-pmic: Pass WLED compensation resistor value

    Pass WLED compensation resitor value via platform data.

    Change-Id: I318b2edc817f50181bd2b7c08cb01b15b72cc5e6
    Signed-off-by: Shantanu Jain <shjain@codeaurora.org>

commit c86ceac487579b46506945a41603406061719426
Author: Shantanu Jain <shjain@codeaurora.org>
Date:   Wed May 29 16:10:42 2013 +0530

    led: leds-pm8xxx: Add support to control compensation resistor

    Add support to control compensation resistor of WLED
    passed from the board file platform data.

    Change-Id: Id5f36d49a532d8216ea9bc1415e67135d40ee18d
    Signed-off-by: Shantanu Jain <shjain@codeaurora.org>

commit 8f0a5d55b36e23a58c71199a5d24928d7148a09f
Merge: a50841b 5ca6c2a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri May 31 00:31:20 2013 -0700

    Merge "USB: ci13xxx_udc:  Retire pending requests while flushing an endpoint"

commit 13e6d4fb311aea48a09f59623073991f6d0418da
Author: Anirudh Ghayal <aghayal@codeaurora.org>
Date:   Tue May 7 16:40:12 2013 +0530

    power: pm8921-bms: Update the FCC learning algorithm

    1. Add configurable parameters to
    	- enable/disable fcc learning
    	- minimum soc to start FCC learning
    	- minimum ocv (pc) to start FCC learning
    	- minimum cycles to update fcc vs temp. table

    2. New FCC is calculated using the cc count-
    	FCC_NEW = (cc_end - cc_start) / (soc2 - soc1)
    	cc_end = CC count when charing ends
    	cc_start = CC count when charging starts
    	soc1, soc2 = starting and ending SOC_rbatt value

    3. Add a new sysfs entries to update the learnt fcc values
       to userspace. These values are restored back on
       reboot.

    CRs-Fixed: 417288
    Change-Id: I0dc713d59ef9c45f96b9f0b5844252758bd09320
    Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>

commit 5414a93162051c03fdabbb79a65901fcbf18ac72
Author: Damir Didjusto <damird@codeaurora.org>
Date:   Tue Apr 30 16:12:40 2013 -0700

    ASoC: msm: Add PCM loopback volume control

    Add PCM loopback volume controls.

    Change-Id: I4d942c16b524797ca535dd0467a830d19963e967
    Signed-off-by: Damir Didjusto <damird@codeaurora.org>

commit a50841b914da48b49c86087b72926883916f0825
Merge: f801c6a f3904f9
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 30 16:58:12 2013 -0700

    Merge "tty: n_smux: Rename SSR unit tests"

commit f801c6a770e2d08a8ab5b0182a459a6e267678bf
Merge: c69dd3d 8570d44
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 30 16:58:11 2013 -0700

    Merge "tty: n_smux: Add wakeup test case"

commit c69dd3dda907ba2316ffcd730cbf422ad3344d9e
Merge: 5ba0751 afcc45e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 30 16:58:09 2013 -0700

    Merge "tty: n_smux: fix test pattern validation"

commit 5ba075158573191398438c3cee62f00d1892636a
Merge: 36160d5 f37eef2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 30 16:58:08 2013 -0700

    Merge "tty: n_smux: Add throughput metrics to unit tests"

commit 36160d5275174b9028ebadc42fa92410ed9363e4
Merge: a5aeda5 3a26a00
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 30 16:58:07 2013 -0700

    Merge "tty: n_smux: Make test functions static"

commit f60ee6a7daf13f1698eb772657b3782053381b20
Author: Subhash Chandra Bose Naripeddy <snariped@codeaurora.org>
Date:   Thu Apr 25 19:32:52 2013 -0700

    ALSA: PCM: volume API implementation

    Introduced a new helper function snd_pcm_add_volume_ctls() to
    create control elements representing the volume for each PCM
    (sub)stream.

    Change-Id: Id483257c4fe84a909e7a4af3a5aa3e4f0d5d9ea5
    Signed-off-by: Damir Didjusto <damird@codeaurora.org>

commit a447653e9acf9acb0d4bcdd3c337d8d8dc893e37
Author: Sameer Thalappil <sameert@codeaurora.org>
Date:   Thu May 23 18:12:23 2013 -0700

    defconfig: wcnss: Enable wcnss pre-alloc memory

    Enable support for pre-alloc memory for WLAN driver.

    Change-Id: I0a18cfcfeb23538e6e0b2f5144f686b26170e1d1
    CRs-Fixed: 369983
    Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>

commit 965a3590c421d533dac6f8ae5128ea6e2e7ce744
Author: Sameer Thalappil <sameert@codeaurora.org>
Date:   Mon Sep 10 11:58:33 2012 -0700

    wcnss: Pre-alloc memory for WLAN driver

    WLAN driver will use this pre-allocated memory (when available) for
    large memory allocations; this will prevent WLAN driver load
    failures because of the un-availability of the large size slabs
    during module load.

    Change-Id: I8a8139bdf343ddc871036f6d5c6ab90993816de0
    CRs-Fixed: 369983
    Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>

commit a5aeda51f06bdde3ccd7f88a456f3aac0bd1d981
Merge: fd27236 c1584b2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 30 11:19:58 2013 -0700

    Merge "msm: camera: Add null checks for stats module"

commit f3904f9d2a9cdbe0c4ce91e3147622fa587595fc
Author: Eric Holmberg <eholmber@codeaurora.org>
Date:   Tue May 21 18:08:06 2013 -0600

    tty: n_smux: Rename SSR unit tests

    Running the Subsystem Restart (SSR) unit tests without SSR enabled
    causes the system to halt.

    Rename SSR unit tests to allow for testing all non-SSR tests
    quickly from the command line.

    CRs-Fixed: 493907
    Change-Id: Ib80e9adef8311ebe038f878dfcf2aecd1087a471
    Signed-off-by: Eric Holmberg <eholmber@codeaurora.org>

commit 8570d44c92a9fcccf97cf22916abe97e7b00179c
Author: Eric Holmberg <eholmber@codeaurora.org>
Date:   Tue May 21 18:04:50 2013 -0600

    tty: n_smux: Add wakeup test case

    Reproducing and isolating wakeup issues caused by incorrect UART
    configuration and hardware issues currently requires analysis of the
    internal logs which is often time consuming.

    Add wakeup test case to allow teams to easily reproduce wakeup issues or
    verify wakeup functionality.

    CRs-Fixed: 493907
    Change-Id: I614d6ee3eefc6563930c45564b76452e89f65dc8
    Signed-off-by: Eric Holmberg <eholmber@codeaurora.org>

commit afcc45efa548ccc97af5c1682d434f72a314c6e2
Author: Eric Holmberg <eholmber@codeaurora.org>
Date:   Tue Apr 9 11:56:53 2013 -0600

    tty: n_smux: fix test pattern validation

    Incorrect test pattern code was skipping the test pattern validation
    test and not freeing the test buffer resulting a slow memory leak in the
    unit test that could lead to out-of-memory failures after several
    hundred thousand iterations.

    Fix pointer test to properly free memory after test case completion and
    fix incorrect test pattern validation code.

    CRs-Fixed: 493907
    Change-Id: If93c2cfd2f82295897b36ffaf98ecaa5b9128cfb
    Signed-off-by: Eric Holmberg <eholmber@codeaurora.org>

commit f37eef25929f11bb01595735d428f8656ce9ba7b
Author: Eric Holmberg <eholmber@codeaurora.org>
Date:   Thu Oct 11 11:13:46 2012 -0600

    tty: n_smux: Add throughput metrics to unit tests

    Add throughput metrics to unit tests to enable profiling the performance
    of SMUX round-trip messaging.

    CRs-Fixed: 493907
    Change-Id: I1eb552ca53358ece9f95a99a340409a4464877fb
    Signed-off-by: Eric Holmberg <eholmber@codeaurora.org>

commit 3a26a00a74d842e312d2d405005811a1555bf3f0
Author: Eric Holmberg <eholmber@codeaurora.org>
Date:   Mon Oct 29 14:12:34 2012 -0600

    tty: n_smux: Make test functions static

    Local test functions should be static to prevent duplicate
    symbol collisions with other modules.

    CRs-Fixed: 493907
    Change-Id: I43cf6199fa1fa5fe58e81c9b4e5b5c18f3539341
    Signed-off-by: Eric Holmberg <eholmber@codeaurora.org>

commit fd2723623460ef3dbbe02fe97c104c58498f125b
Merge: 11ad462 62228fe
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 30 08:10:46 2013 -0700

    Merge "msm: vidc: Allow client to set turbo mode"

commit 11ad4621d5e26cf5522bc7438557f573840ce49e
Merge: acb35c3 418a25a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 30 08:10:32 2013 -0700

    Merge "gpu: ion: Do fallback when allocating large sizes"

commit 5f43c9eaeeba70f8f100f741d06466eaa9335924
Author: Huaibin Yang <huaibiny@codeaurora.org>
Date:   Mon Mar 18 11:48:29 2013 -0700

    msm_fb: display: change TE simulation and read pointer interrupt timing

    The current parameters for command mode TE simulation on mdp side are
    not straightforward and cause double read pointer interrupts. Now make
    read pointer interrupt and line counter reset happen right at h/w
    vsync, and kick_off start position and height are set to back porch
    and max respectively, so timing is much simplified and the chance of
    tearing is reduced.

    CRs-fixed: 463273
    Change-Id: Ia25710556bc2b031cdfaaf08fee034baab33d124
    Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
    Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
    Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
    Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>

commit bc0c1c2e31c1eb2dcf33157df43560e4db53f268
Author: Hamad Kadmany <hkadmany@codeaurora.org>
Date:   Thu May 30 11:55:11 2013 +0300

    media: dvb: Fix race condition in DVR thread

    When DVR thread is created, it may happen that user sets
    DVR buffer mode to external buffer but did not yet set the
    buffer itself, meanwhile, DVR thread checks whether the
    input buffer was already set and if not the thread terminates.

    This causes termination of DVR thread for no good reason.
    DVR thread should be terminated only when DVR device is closed.
    The change removes termination of the thread when input buffer
    is not set yet to avoid such race condition.

    CRs-Fixed: 493761
    Change-Id: I57c9acd13bd493ae08d28703bf5f6c0dea55c20a
    Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>

commit acb35c38b5212123d6477a25e74a15d87822f77a
Merge: 633828a c6f6876
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 30 01:57:11 2013 -0700

    Merge "msm: 8064: Add connector resistance"

commit 633828a4b434add49c19317b655a82d5909e6d2a
Merge: 6f666cd b0fe3c9
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 30 01:56:38 2013 -0700

    Merge "ASoC: msm: Fix wrong wait_event_timeout timeout checks"

commit e624587821bd1f73ccf994b888d10605d7717f7f
Author: Rajkumar Raghupathy <raghup@codeaurora.org>
Date:   Thu May 23 11:37:41 2013 +0530

    u_ether: Handle memory allocation failure case on tx path

    With multipacket feature enabled, if the memory allocation for
    tx request buffer fails, accessing the req->buf leads to null pointer
    dereference crash.

    Hence, handle memory alloction failure case and return -ENOMEM.

    CRs-Fixed: 490085
    Change-Id: Ic5faac8ea7eb056755b03007c48ff085f10afa20
    Signed-off-by: Rajkumar Raghupathy <raghup@codeaurora.org>

commit 418a25af3f55a05ad7c8a64ab5edfc23a99860c6
Author: Olav Haugan <ohaugan@codeaurora.org>
Date:   Fri May 17 17:09:49 2013 -0700

    gpu: ion: Do fallback when allocating large sizes

    The preferred allocation of memory for kernel data structures in
    ION is to use kmalloc. This is mainly for performance reasons. However,
    we are not guaranteed to be able to allocate large sizes. So to keep
    the code performing well and at the same time allow for larger allocations,
    implement a fallback mechanism for allocation of memory for ION kernel data
    structures.

    CRs-Fixed: 488521
    Change-Id: I8c6a13ad74cce69f590920d28c01a58f7a540fd2
    Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
    [Resolved merge conflict]
    Signed-off-by: Chintan Pandya <cpandya@codeaurora.org>

commit 6f666cd1d93777697dad2b96cf7236c16f1c7c5c
Merge: 4cfd0e9 dacf91d
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed May 29 04:10:51 2013 -0700

    Merge "msm: kgsl: Protect the mem_entry list during deletion"

commit c6f687698c3329f54348fc3aa4d509e4069c5d05
Author: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Date:   Mon Jul 30 12:48:17 2012 -0700

    msm: 8064: Add connector resistance

    The adjust vdd max algorithm in the charger driver needs connector
    resistance to set the battery voltage appropriately.

    Set the connector resistance value from the board file.

    Change-Id: If934783e2910c8456090c8926e934138abb75222
    Signed-off-by: Xiaozhe Shi <xiaozhes@codeaurora.org>

commit 0179fad1596d146ef1bc64b664e4911ceb84fb7a
Author: Shantanu Jain <shjain@codeaurora.org>
Date:   Fri May 24 14:24:09 2013 +0530

    arm: board-8930: Add synaptics firmware name in platform data

    Add synaptics firmware name in platform data

    Change-Id: I011144acc82f4fca25b9d40e05a3850117001230
    Signed-off-by: Shantanu Jain <shjain@codeaurora.org>

commit 5fa7bf0225c02a53d7e2cc465fa5dab22073f9c9
Author: Hamad Kadmany <hkadmany@codeaurora.org>
Date:   Wed May 29 11:06:52 2013 +0300

    media: dvb: Add initialization of PES error indicators

    Following SDMX notification on PES data the errors indicators
    for PES event were not cleared if SDMX did not report any error.

    CRs-Fixed: 493108
    Change-Id: I89b43ce193b96462b804848c5e484d25343d5f40
    Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>

commit 4cfd0e9fffa2a2bdb76892b48aa2cf7cd3bf51cd
Merge: 4d6fa12 5599171
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed May 29 00:55:16 2013 -0700

    Merge "ci13xxx_udc: Acquire spinlock before calling ep_nuke()"

commit f1de558b54040a7a1787748e420c82bf74ac623c
Author: Aditya Jonnalagadda <ajonnala@codeaurora.org>
Date:   Thu May 9 11:43:42 2013 +0530

    msm: camera: Add state check for sensor power up & down

    Sensor state check added to avoid incorrect power up &
    power down calls.

    Change-Id: I278e8be1e346f93fa410b38086388f08c4f6ae31
    Signed-off-by: Aditya Jonnalagadda <ajonnala@codeaurora.org>

commit 4d6fa12bbebaa136218b2163b85d7eeae4e26673
Merge: 661bcd6 3a24f09
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue May 28 22:52:29 2013 -0700

    Merge "media: dvb: Protect against removing all PIDs from an active filter"

commit 661bcd6e468c80019711e0ccce6443a23fe598b7
Merge: 3e865ed a8ef775
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue May 28 22:52:21 2013 -0700

    Merge "msm: kgsl: Submit a draw command on resume"

commit 3e865ed32d6a4fe2e1ea334e6907f01575d210e7
Merge: 5635638 2438199
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue May 28 14:52:09 2013 -0700

    Merge "msm_fb: hdmi: Proper intialization of mhl resolutions"

commit 5ca6c2a39d3ae1561e7c8fb2457399cfe1505b07
Author: Pavankumar Kondeti <pkondeti@codeaurora.org>
Date:   Tue May 28 15:14:21 2013 +0530

    USB: ci13xxx_udc:  Retire pending requests while flushing an endpoint

    Rmnet and dun function drivers are designed to start fresh upon MODEM
    restart.  The current code is flushing endpoints without freeing
    requests.  New requests are allocated again after MODEM is powered up.
    All accumulated requests are freed only upon cable disconnect.  If
    MODEM is restarted multiple times without disconnecting the cable, we
    are running low memory issues.

    A pending request can not be freed without dequeuing it.  Dequeuing
    all requests in a loop is a heavy operation and involves changing
    multiple function drivers.  All pending requests are retired upon
    disabling an endpoint.  But an endpoint can not be disabled in
    configured state.  Hence retire pending requests while flushing an
    endpoint.

    CRs-Fixed: 489047
    Change-Id: I3440a204ad8c4beb043b1068cb1d3965be96e9b7
    Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>

commit 3a24f095cce64973168ea5b4b01c6dc81595847f
Author: Hamad Kadmany <hkadmany@codeaurora.org>
Date:   Tue May 28 11:38:13 2013 +0300

    media: dvb: Protect against removing all PIDs from an active filter

    When TS filter is active (running), it is not allowed to remove
    all PIDs associated with the filter; The filter state would be
    invalid and as such may result in unexpected behavior while
    performing runtime operations on the filter.

    CRs-Fixed: 492444
    Change-Id: I340b02bed218e89ffe89932e3b3e9ea93f429876
    Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>

commit 55991711c61d160290fa329739a29bd61adfc330
Author: Rajkumar Raghupathy <raghup@codeaurora.org>
Date:   Wed May 22 14:29:46 2013 +0530

    ci13xxx_udc: Acquire spinlock before calling ep_nuke()

    The commit b0ad433 (USB: ci13xxx_udc: Fix kernel panic during
    composition switch) adds ep_nuke() function in gadget_stop_activity().

    _ep_nuke() releases and re-acquires spinlock on every entry of the
    function. Acquiring spinlock before calling _ep_nuke() is necessary,
    else it may end up in unlocking the lock twice, as it is already
    unlocked before calling _ep_nuke(), which may lead to crash.

    Hence, acquire spinlocks before calling _ep_nuke() function.

    CRs-Fixed: 486502
    Change-Id: Ia80b9facb8e592f8fb41879dc08f9f1a04a20b48
    Signed-off-by: Rajkumar Raghupathy <raghup@codeaurora.org>

commit 56356383c7ffb9f9b5c4ddfc40a5befac981eb46
Merge: 45f1cd6 859fd8c
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 27 07:52:54 2013 -0700

    Merge "video: msm: Initialize HistLUT with last saved LUT"

commit 45f1cd6e8ee0fc4492a656ed603012630faa391f
Merge: 3b1e89e 5888e66
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 27 07:52:53 2013 -0700

    Merge "video: msm: Maintain histogram LUT state through suspend resume"

commit 3b1e89e1ccdaaa3307135e631e9478186ddf0131
Merge: 994d6fd 8edf6d6
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 27 07:52:45 2013 -0700

    Merge "USB: ci13xxx_udc: Fix kernel panic during composition switch"

commit 994d6fd8e8066a39f259a4a91ae002b1de0f7f98
Merge: 8342840 6e9f2b0
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 27 07:52:37 2013 -0700

    Merge "Fix disconnect not sent from host when pairing is cancelled"

commit 834284015c0778c0a95ed8a2c560e404cc6c995f
Merge: 5038dee f431dc2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 27 07:52:29 2013 -0700

    Merge "msm: vidc: Remove unncessary unmap function calls"

commit 5038dee6e2c5a7f8b2fb34a80458195385800db0
Merge: 39b28ce f5cac71
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 27 01:59:49 2013 -0700

    Merge "msm: mdp: Revert MDP Port split changes"

commit 39b28cedfd85d2d9f47f37a6e23d3d7b3dba527c
Merge: eccff3d bd09116
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat May 25 09:28:39 2013 -0700

    Merge "msm: camera: Handle locks properly"

commit eccff3d7b31569d225961160fc21f5914af4d5dc
Merge: 4719207 1f504cb
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat May 25 09:28:31 2013 -0700

    Merge "msm-camera:Fix integer overflow when processing msm gesture ioctl."

commit 47192078b2fb37f6de26a7fc2c67f8ad69aa5cf6
Merge: c229a6b 45f3f06
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat May 25 02:19:58 2013 -0700

    Merge "media: dvb: Fix support for maximum TSPP buffer size"

commit c229a6b7d3430200f7f40cfff6a617255a1f65e0
Merge: 8920721 1787385
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri May 24 20:55:54 2013 -0700

    Merge "diag: Upgrade Diag code on this branch"

commit f431dc2d501d92f03551a23260d7a09bd0f79de2
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Mon May 20 21:33:26 2013 +0530

    msm: vidc: Remove unncessary unmap function calls

    Calling unncessary unmap function resulting in
    target reset. This change resolves the issue by
    removing unncessary unmap functions in video driver.

    Change-Id: I0b501f0a7115bba085b067a5e78172df210da8f1
    Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>

commit 89207214e7cdefc9ee67af5843df22b30b268af4
Merge: 712037d aa513e7
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri May 24 11:22:08 2013 -0700

    Merge "mmc: msm_sdcc: Enable clock scaling capability"

commit 712037dc7fd3f9deec485f7cae4fbb99da9fa608
Merge: 62893a1 cdde1a8
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri May 24 07:05:48 2013 -0700

    Merge "msm: msm_fb: remove mmio access through mmap"

commit d0a4aebbc871a62c6b88e41ed1d49487e49789bd
Author: Amy Maloche <amaloche@codeaurora.org>
Date:   Thu May 16 10:58:32 2013 -0700

    input: synaptics_i2c_rmi4: Properly enter low power mode

    When entering low power mode, i2c pull up regulator
    must be set with LPM current, not active current.

    Change-Id: Idc87cd57b8a4f75b665d3045123176b158b16691
    Signed-off-by: Amy Maloche <amaloche@codeaurora.org>

commit 62228feb48e7a768824ee3f94f37d96e5aad8db5
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Thu May 23 16:38:29 2013 +0530

    msm: vidc: Allow client to set turbo mode

    - Allow client to set TURBO performance level
      to video driver.
    - Update max performance level to TURBO perf level
      on supported targets.

    Change-Id: I0b3b38140d777984ba5062ddd614c07a002389ba
    Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>

commit 62893a1feae9c626fce71ff23caba27410ecbb8b
Merge: dae70a1 74a9d5e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri May 24 04:27:22 2013 -0700

    Merge "msm: camera: Change CSI release sequence"

commit dae70a197c6f120fc7b608577f193659fc28f834
Merge: 00e04fd 501441b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri May 24 04:27:13 2013 -0700

    Merge "msm: vidc: Optimize IOMMU map size for H264 decoder"

commit bd091165419f0fcc6c3f38fef030509350063694
Author: satyavaraprasad yerramsetti <satyav@codeaurora.org>
Date:   Fri May 24 12:14:32 2013 +0530

    msm: camera: Handle locks properly

    Update camera drivers to unlock mutex while returning
    the function in caseof errors.

    Change-Id: Iaac7ae3a0337445ee072c10c69080c24ed6e512c
    Signed-off-by: satyavaraprasad yerramsetti <satyav@codeaurora.org>

commit e2a6f5fc5a3585ab8ec23aef062df3ba11c5db15
Author: Gagan Mac <gmac@codeaurora.org>
Date:   Wed May 8 11:29:38 2013 -0600

    msm: msm_bus: Correct the return value from register-client

    On failure, return 0, and not a non-zero value as that can
    be interpreted as a valid client ID.

    CRs-Fixed: 486328
    Change-Id: I7a5b448bc398b4a4792170147a5e5317d25f8b3c
    Signed-off-by: Gagan Mac <gmac@codeaurora.org>
    Signed-off-by: Alok Chauhan <alokc@codeaurora.org>

commit 501441b7c7c5f4b332a265aaf0dca9b28580bf2c
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Thu May 9 11:24:16 2013 +0530

    msm: vidc: Optimize IOMMU map size for H264 decoder

    IOMMU map size is not required to be double the actual
    buffer size for H264 decoder. So reducing IOMMU map
    size for H264 format which will enable support for
    two H264 decoder instances in parallel in smooth streamig
    mode where the number of output buffers equal to 18 with
    each buffer size equal to 1080p buffer size.

    CRs-fixed: 491718
    Change-Id: Ie6782b2ff58667000213f25482eea151b849762b
    Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>

commit 859fd8c2541d2c8b4b2fbbeaa2c9a8dc6ebad116
Author: Jeevan Shriram <jshriram@codeaurora.org>
Date:   Thu May 23 21:27:05 2013 +0530

    video: msm: Initialize HistLUT with last saved LUT

    Set HistLUT to last value written to LUT when MDP is turned on. Assumes
    that last LUT corresponds to last BL scale value sent.

    CRs-Fixed: 475149
    Change-Id: I7383666c2d1f3d8800c5f25e2ef648568eb33a74
    Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
    Signed-off-by: Jeevan Shriram <jshriram@codeaurora.org>

commit 5888e6693aee56248c518fe071c795bf0645a5b4
Author: Jeevan Shriram <jshriram@codeaurora.org>
Date:   Thu May 23 21:06:58 2013 +0530

    video: msm: Maintain histogram LUT state through suspend resume

    Make sure LUT state is maintained after suspend resume. Required to ensure
    HistLUT and backlight scale are in sync.

    CRs-Fixed: 476491
    Change-Id: Icc999aa0b04cad93ceed334426f61b71cbdd0a13
    Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
    Signed-off-by: Jeevan Shriram <jshriram@codeaurora.org>

commit 1787385f93b85be30dff7121fd558eef04786b9e
Author: Ravi Aravamudhan <aravamud@codeaurora.org>
Date:   Thu May 23 17:16:19 2013 -0700

    diag: Upgrade Diag code on this branch

    Diag on A-Family mainline is out of data. This change
    includes the following changes to bring diag code up to date.

    1. Updated the msg SSIDs, log codes and event IDs
    2. Fix concurrency issues when processing userspace inputs
    3. Add notification that diag supports feature mask
    4. Update SSIDs and log codes
    5. Fix writing of error message for mode command
    6. Bring diag control message support up to date
    7. Updated the msg SSIDs, log codes and event IDs
    8. Fix array out of bounds access

    This includes a crash fix due to out of bounds access.

    CRs-Fixed: 488175

    Change-Id: I0b315b5f5da0fecdbbd0cf071e05f2cf3ffd9ccb

    Signed-off-by: Ravi Aravamudhan <aravamud@codeaurora.org>

commit 00e04fda1900ad9552c90e4ef7f863934f350620
Merge: bb97124 ae0e2ec
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 23 12:06:54 2013 -0700

    Merge "msm: kgsl: Don't consider active count if not in active state"

commit 6e9f2b0dc6daba857ccba9103e95c6c787ada1ba
Author: Subramanian Srinivasan <subrsrin@codeaurora.org>
Date:   Tue May 21 15:42:28 2013 -0700

    Fix disconnect not sent from host when pairing is cancelled

    Fixes the issue that disconnect command is not sent
    from the host when pairing is cancelled.

    CRs-fixed: 489957

    Change-Id: I600a526aa9b95a3f17d77d5ef16d91e206ce7161
    Signed-off-by: Subramanian Srinivasan <subrsrin@codeaurora.org>

commit a8ef775451910fe978b2df8bf10a3e2c155feb20
Author: Lynus Vaz <lvaz@codeaurora.org>
Date:   Tue Nov 20 18:26:56 2012 +0530

    msm: kgsl: Submit a draw command on resume

    For A305, submit an extra draw command while resuming the GPU from
    SLUMBER state. This fixes corruption seen when the screen is
    turned on.

    Change-Id: Iafed90b617b0a700ac3f2afcb6d9ecadca590914
    Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>

commit 3052d6c13e8a129da05464208321e1b195c0e528
Author: Amy Maloche <amaloche@codeaurora.org>
Date:   Wed May 1 13:31:57 2013 -0700

    input: synaptics_fw_update: Add force update entry

    Add sysfs entry option to force update firmware, regardless
    of versioning.

    Change-Id: I85a12c531ee3d64a74da272b6e73b514eafc136a
    Signed-off-by: Amy Maloche <amaloche@codeaurora.org>

commit 6750381e378c3c4030356caba391e1f11bfee88e
Author: Amy Maloche <amaloche@codeaurora.org>
Date:   Tue Apr 16 18:43:22 2013 -0700

    input: synaptics_fw_update: Add firmware ID reading

    - Fix issue of converting config id
    - Support "Option 1 (bit0)" in image file header
      -- Query firmware build id from image file header

    Change-Id: Iabd24d662762b67de7163ad7321f95f1c58f1459
    Git-commit: 7e811dcd8eaf3fc0df765335d0ef14926f325f64
    Git-repo: git://github.com/synaptics-touch/synaptics-dsx-i2c.git
    [amaloche@codeaurora.org: only portion of patch taken.
     Custom changes were necessary to add for integration
     with mainline]
    Signed-off-by: Amy Maloche <amaloche@codeaurora.org>

commit 524e230c295e795e50a7a346c33199fc29b9af6f
Author: Amy Maloche <amaloche@codeaurora.org>
Date:   Mon Apr 29 10:40:41 2013 -0700

    input: synaptics_i2c_rmi4: allocate memory for interrupt status

    In synaptics_rmi4_i2c_read, intr_status is a char variant.  So
    if num_of_intr_regs > 1, then intr_status will write 2 bytes.  This
    will destroy the stack, so avoid it.

    Change-Id: I5c16e491a84d3f8dd96a11810c060944a457b99a
    Signed-off-by: Amy Maloche <amaloche@codeaurora.org>

commit 72dfae260a961a91c6d0cf0811b77809514f86fb
Author: Amy Maloche <amaloche@codeaurora.org>
Date:   Wed Feb 27 15:25:14 2013 -0800

    input: synaptics_i2c_rmi4: Add low power mode

    Enable regulators to go into low power mode when
    device enters suspend, to save power.  In resume,
    return regulators to full power.

    Change-Id: I6f5a6d398732b2e23aeba81b3569ae2c081f31e5
    Signed-off-by: Amy Maloche <amaloche@codeaurora.org>

commit dacf91dff781e9d416a0e812d80c62681ea8894a
Author: Lynus Vaz <lvaz@codeaurora.org>
Date:   Mon May 20 15:23:20 2013 +0530

    msm: kgsl: Protect the mem_entry list during deletion

    Use the spinlock to prevent corruption of the mem_entry list during
    deletion. Otherwise the mem_entry list may be modified by another
    thread at the same time resulting in memory corruption.

    Change-Id: I5728a8b925753d5fda82413615e5ebaf0366dfd8
    CRs-fixed: 489224
    Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>

commit aa513e706c2f3db9ee5b9010f160aa9dde9d1333
Author: Sujit Reddy Thumma <sthumma@codeaurora.org>
Date:   Wed Oct 31 22:45:45 2012 +0530

    mmc: msm_sdcc: Enable clock scaling capability

    Enable capability, MMC_CAP2_CLK_SCALE to allow mmc core
    to scale the clocks at runtime based on load on card.

    Clock scaling in MSM platforms also allow voltage scaling between
    NOMINAL and SVS levels, thus allowing additional power savings.

    Change-Id: Id1995ffea7a6c06a2e8b29b43da70894f35f6c0b
    Signed-off-by: Sujit Reddy Thumma <sthumma@codeaurora.org>

commit bb971246f2f829b52e049675a2649bc24e7a50f4
Merge: 0a79c2c 6f53984
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 23 02:16:13 2013 -0700

    Merge "gpu: msm: Allow retries for 0 order allocation"

commit 0a79c2c470debe8d7a07842acb480d342bf9108c
Merge: 46799b5 d328e5f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 23 02:16:01 2013 -0700

    Merge "msm: vidc: Remove unwanted error message"

commit 46799b5550ce3400c8a841201a5c9b437cc93553
Merge: 731f7f8 636f80e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed May 22 23:11:49 2013 -0700

    Merge "ASoC: msm: qdsp6: Add error check for memory commands"

commit 731f7f8efc6641bb532677defedba2cae067f714
Merge: 7541d76 5abd66d
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed May 22 23:11:27 2013 -0700

    Merge "msm: msm_bus: Add NULL pointer checks."

commit 896ca9f728c536c09ed67aff624e6b1db8222bef
Author: Joel King <joelking@codeaurora.org>
Date:   Wed May 22 16:56:28 2013 -0700

    msm: mdm: change where ssr_count is decremented

    In fusion targets with more than one external modem, where
    the modems are restarted together, ssr_count keeps track of
    how many modems are still left to be completely restarted so
    that any new SSR requests would be rejected until all modems
    are restarted. Ssr_count should be decremented when the SSR
    module sends the SUBSYS_AFTER_POWERUP notification instead of
    during the powerup callback in order to be in sync with the
    state of the SSR module.

    Change-Id: I196f4937d929c54f475d251632f111404a2b3bf1
    Signed-off-by: Joel King <joelking@codeaurora.org>

commit 26cffa19d838c09f17747a47d403f5a6b6202c9f
Author: Kuirong Wang <kuirongw@codeaurora.org>
Date:   Fri Dec 7 19:16:24 2012 +0530

    ASoC: WCD9304: Add the compander support to wcd9304

    The compander system is intended to increase the dynamic
    range of an input signal. But for the wcd9304 codec,
    this feature is to use companding in a novel way in the DAC
    converter path to increase the signal noise ratio.
    The change is to add the compander support to wcd9304
    codec. The dynamic compander enable/disable during stream
    playback is not supported.

    Change-Id: If912302ee9d48dde1318e894a982cba591908d8f
    Signed-off-by: Kuirong Wang <kuirongw@codeaurora.org>

commit d328e5fe83308041fffae8d768094f4dd544477e
Author: Srinu Gorle <sgorle@codeaurora.org>
Date:   Tue May 21 01:47:31 2013 +0530

    msm: vidc: Remove unwanted error message

    This change removes unwanted error message about video
    clock settings.

    Change-Id: I49f30d681366e07a2e002a9df58460962fd12318
    CRs-Fixed: 488058
    Signed-off-by: Srinu Gorle <sgorle@codeaurora.org>
    Signed-off-by: Deepak Verma <dverma@codeaurora.org>

commit 45f3f06e88a094ecf1c8e17dd2524384b0827488
Author: Hamad Kadmany <hkadmany@codeaurora.org>
Date:   Wed May 22 15:40:38 2013 +0300

    media: dvb: Fix support for maximum TSPP buffer size

    The maximum allowed buffer size depends on maximum allowed
    number of BAM descriptors. The maximum allowed number of
    descriptors was changed to meet HW capabilities. A check
    whether user buffer size requires number of descriptors
    larger than what is allowed was added.

    CRs-Fixed: 490749
    Change-Id: Ic60414af156ee8d969263b7636393693277c8f61
    Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>

commit 8edf6d6714bc8987d240331d9428a10ee295687d
Author: Pavankumar Kondeti <pkondeti@codeaurora.org>
Date:   Mon Apr 22 16:29:23 2013 +0530

    USB: ci13xxx_udc: Fix kernel panic during composition switch

    The control endpoint requests are not nuked properly during
    composition switch.  The stale request is getting completed
    during enumeration of the new composition.  Kernel panics if
    completion handler access already freed data.  This is happening
    with RNDIS interface.

    The Android composite driver dequeue the control request before
    removing the composition.  The current code returns immediately
    if the queue is empty.  The control endpoint queues are handled
    differently.  The EP0 IN endpoint is only exposed to the composite
    driver.  The controller driver takes care of queuing the request
    on EP0 IN or EP0 OUT based on control transfer direction.  When
    the composite driver dequeue request on control endpoint, check
    both direction endpoints queues.

    When USB bus is reset, nuke the control endpoints.  Flushing the
    endpoint will not call completion handler.

    Test endpoint queue list, request list, endpoint descriptor and
    soft pull up status under spinlock to prevent any races between
    dequeue and queue paths.

    CRs-Fixed: 474578
    Change-Id: I3d7ca4be4d6cee65707879c6c9b501f442e53018
    Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>

commit 6f53984fb9b9e52ac7ffe82466c3caea1617ab6b
Author: Olav Haugan <ohaugan@codeaurora.org>
Date:   Fri May 17 13:35:23 2013 -0700

    gpu: msm: Allow retries for 0 order allocation

    When allocating order 0 pages we allow the allocator to retry
    the allocation to ensure we can take advantage of pages that
    are being reclaimed. This will help avoid unnecessary out
    of memory errors from kgsl clients.

    Change-Id: Iec2a0a1fe10302c320a58cef90ae1ee7e35d71ee
    Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>

commit 7541d76d18681d8fd2b17abc960dd90cadd17e87
Merge: 0223689 faed5e5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed May 22 03:01:33 2013 -0700

    Merge "input: atmel_mxt_ts: Fix screen unlock issue after resume"

commit 0223689c015b4bf49b07dcb0c3c007e89c10425e
Merge: 44fcb45 71587ee
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed May 22 03:01:06 2013 -0700

    Merge "msm: vidc: Set extradata flag properly"

commit 44fcb457b861e550e05185d9d0b42b4f026188c9
Merge: ea4b988 78ce4ac
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed May 22 03:00:43 2013 -0700

    Merge "msm: gemini: Reset the core incase of overflow error"

commit ea4b9884eead53d4be9c37ff6a87d1fdbe167d55
Merge: f5db6cd b75b0ce
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed May 22 03:00:41 2013 -0700

    Merge "msm: gemini: Fix the error irq handling sequence"

commit f5db6cdb7eb968deb0626c6ad6d0864a4b202a8c
Merge: f9841ae 6411fc8
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed May 22 00:20:12 2013 -0700

    Merge "defconfig: Enable IPSec related configuration"

commit 5abd66dd0807a05cc081ce9057ade0725609f6b2
Author: Kiran Gunda <kgunda@codeaurora.org>
Date:   Thu Mar 14 17:11:15 2013 +0530

    msm: msm_bus: Add NULL pointer checks.

    Bus driver is crashing due to a NULL pointer
    access sent by the client. A few NULL pointer
    checks have been added to protect the driver
    from invalid/NULL client handle.

    CRs-Fixed: 458264
    Change-Id: I822ad312ba1a0c0939d97eb92ea53094d408a836
    Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>

commit 24381991b94d86d2714486691ce9705de3672db8
Author: Ajay Singh Parmar <aparmar@codeaurora.org>
Date:   Tue May 21 22:10:29 2013 +0530

    msm_fb: hdmi: Proper intialization of mhl resolutions

    This change adds missing video format intialization

    CRs-Fixed: 481049
    Change-Id: Ic14eaba7fefcb8b7f9240cae8c179e3dbeef72a5
    Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>

commit 636f80eaf0845fbf36f735e943e8233185fe252d
Author: Deepa Madiregama <dmadireg@codeaurora.org>
Date:   Thu Jan 17 14:01:25 2013 +0530

    ASoC: msm: qdsp6: Add error check for memory commands

    - Write failures observed during audio playback.
    - Error checks are missing for memory map and memory unmap cmds,
      we are proceeding to write data even if memory map is failed. Due
      to this pcm_out_write failures are observed.
    - Add proper error handling for memory map and unmap cmds.

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

commit ae0e2ecbed0466fc5043b9e4c9c4d8c261afe90d
Author: Harsh Vardhan Dwivedi <hdwivedi@codeaurora.org>
Date:   Tue May 21 15:19:16 2013 -0600

    msm: kgsl: Don't consider active count if not in active state

    Don't consider active_cnt variable if not already in ACTIVE state.
    The active count variable does not necessarily exactly indicate the
    number of open handles to GPU for switching power state. Hence,
    only wait for active count to reach zero before switching to SUSPEND
    state if, the current state is ACTIVE.

    CRs-fixed: 483154
    Change-Id: Ie025a1873cfb9237bdfba89204f4c2116549eba4
    Signed-off-by: Harsh Vardhan Dwivedi <hdwivedi@codeaurora.org>

commit 1f504cbf99b04d8adfe641cf48e0e79b96ea3fbf
Author: Praveen Ac <praveenac@codeaurora.org>
Date:   Tue May 21 19:34:47 2013 +0530

    msm-camera:Fix integer overflow when processing msm gesture ioctl.

    Add check for integer overflow.

    CRs-Fixed: 483781
    Change-Id: I9534421f9780f5880ddc6e89fc2b451285ee60e0
    Signed-off-by: Praveen Ac <praveenac@codeaurora.org>

commit f9841aec21ee30c4008cfa1ebaecfd85b2e1f887
Merge: 57a7c31 72248cc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue May 21 07:09:16 2013 -0700

    Merge "msm: audio: qdsp6v2: Fix command sequence issue in Non-tunnel player"

commit 57a7c312d11414cb3f5dd27e727a2d4ed59be014
Merge: 8bb0bca a3249e5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue May 21 07:09:07 2013 -0700

    Merge "ci13xxx_udc: Draw 100mA of current in unconfigured state"

commit 8bb0bcaff588e28b9a566bd8ddabd7aaff9ff8f8
Merge: 9c45013 bb9ceed
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue May 21 07:08:58 2013 -0700

    Merge "Revert "Revert "msm: cache_erp: Handle recoverable L1 errors"""

commit 9c45013e9c2ebe652b35bc700c3941a75f496250
Merge: c8be600 3d69259
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue May 21 05:35:01 2013 -0700

    Merge "ASoC: wcd9310: Fix to reduce the delay while recording"

commit c8be600246e054fb1e72b03b87833e9716b70ccf
Merge: aa77850 2a647c9
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue May 21 05:34:55 2013 -0700

    Merge "spi_qsd: Add runtime PM support to SPI QSD driver"

commit aa778508fe55f753994bf1e3dffa0291ec4ef233
Merge: c5df751 6252fbd3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue May 21 05:34:50 2013 -0700

    Merge "mmc: msm_sdcc: fix a type mismatch in msmsdccc_config_dma()"

commit 78ce4ac6ed2cf266aa2f90641551d02c837caf1a
Author: Sunid Wilson <sunidw@codeaurora.org>
Date:   Mon Apr 22 17:58:53 2013 -0700

    msm: gemini: Reset the core incase of overflow error

    Reset the gemini core for the overflow usecases.

    Change-Id: I64b4283806d67615b2963e0d6a42f04a40d6a892
    Signed-off-by: Sunid Wilson <sunidw@codeaurora.org>

commit b75b0ce7d5ac8abcb95dc2f0219ac4418d89bda2
Author: Sunid Wilson <sunidw@codeaurora.org>
Date:   Sat Apr 20 23:31:41 2013 -0700

    msm: gemini: Fix the error irq handling sequence

    Update the gemini IRQ handling sequence in ISR.

    Change-Id: Ia47e1600174462341027540247a79cba7ffd9c56
    Signed-off-by: Sunid Wilson <sunidw@codeaurora.org>
    Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>

commit 74a9d5e714822a9dc80f4bf64cfbae4ee26a960b
Author: Raju P.L.S.S.S.N <rplsssn@codeaurora.org>
Date:   Wed Feb 20 11:29:23 2013 +0530

    msm: camera: Change CSI release sequence

    CSIPhy is released before CSID in CSI release sequence

    Change-Id: If6788ed35547417397d0547ac27d38769df70217
    CRs-Fixed: 453591
    Signed-off-by: Raju P.L.S.S.S.N <rplsssn@codeaurora.org>

commit 72248cc5c89b4e3b436a473c6d1a39df98c3fa44
Author: Asish Bhattacharya <asishb@codeaurora.org>
Date:   Mon May 13 21:15:16 2013 +0530

    msm: audio: qdsp6v2: Fix command sequence issue in Non-tunnel player

    The CMD_CLOSE and CMD_UNMAP needs to be sequentially sent to dsp.
    Avoid sending CMD_UNMAP if CMD_CLOSE is not sent.

    CRs-Fixed: 485051
    Change-Id: Ic6dd9775b0aea218874161b8a44dc0286608616c
    Signed-off-by: Asish Bhattacharya <asishb@codeaurora.org>

commit 71587eee34315be9ebbd8361f3f2a1390f7404e4
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Mon May 20 16:23:55 2013 +0530

    msm: vidc: Set extradata flag properly

    Extradata flag is not set to output buffer header's flag in
    case when a Mpeg2 clip is played and extenstion and user data
    extradata is not enabled.
    This change fixes the issue and set extradata flag properly
    if extradata is enabled and extradata is available with the
    the buffer.

    CRs-fixed: 490067
    Change-Id: I029dadb17d98dd37388eee34f51bd0dfaf56d14a
    Signed-off-by: Deepak Verma <dverma@codeaurora.org>

commit c5df7510e22ba8fd068975d81957460d67ee1606
Merge: 9276b5c a9c16aa
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 20 22:31:14 2013 -0700

    Merge "msm: camera: Move halt logic in case of overflow to ISR."

commit 9276b5c89d47e7a85bf75f0b8f970a2978412375
Merge: 2519a64 bf47775
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 20 22:31:12 2013 -0700

    Merge "msm: camera: Add recovery routine for live snapshot."

commit 2519a64af998703f22157461fffbcc9a0318bfd8
Merge: e3c1aa7 0485bc0
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 20 22:31:11 2013 -0700

    Merge "msm: camera: Recovery through camif stop and overall reset."

commit e3c1aa7c4c1e52b7fa20e4ceca75af6beee2639d
Merge: 46f2fd5 1c7a78d
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 20 20:17:56 2013 -0700

    Merge "msm: wcnss: Dump PMIC regulator contol registers"

commit 46f2fd5c6c9b6a721b095097d9afb7b6b38ca9b5
Merge: ef5625a 5f90221
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 20 20:17:45 2013 -0700

    Merge "ASoC: msm: qdsp6: Fix for EVRC-B/WB vocoder rate"

commit ef5625a959eb2a7770bec9661f53f6050448c290
Merge: 3c80de7 f44df5b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 20 20:17:29 2013 -0700

    Merge "msm: kgsl: Insert kgsl idle for iommu-v1 when pagetables are changed."

commit bb9ceedcfd5fc3d55be361831ce92390f989c96c
Author: Neha Pandey <nehap@codeaurora.org>
Date:   Mon May 20 17:38:16 2013 -0700

    Revert "Revert "msm: cache_erp: Handle recoverable L1 errors""

    This reverts commit dfaa1681d4a72a31276506791c04bc01d070f3f5.

    Signed-off-by: Neha Pandey <nehap@codeaurora.org>

commit faed5e54931acff052f77887a3f9d498789a6da8
Author: Shantanu Jain <shjain@codeaurora.org>
Date:   Fri May 10 14:48:01 2013 +0530

    input: atmel_mxt_ts: Fix screen unlock issue after resume

    Fix screen unlock issue after resume by releasing all touches in
    mxt_suspend and reseting the controller in mxt_resume.

    CRs-Fixed: 484797

    Change-Id: I3c076680357df9ca98f45e998af9b489907dbba5
    Signed-off-by: Shantanu Jain <shjain@codeaurora.org>

commit 6252fbd31de540e87ed071a794784fb0a80e4410
Author: Subhash Jadavani <subhashj@codeaurora.org>
Date:   Thu May 2 15:36:48 2013 +0530

    mmc: msm_sdcc: fix a type mismatch in msmsdccc_config_dma()

    msmsdcc_prep_xfer() function returns a signed integer value but
    caller function msmsdcc_config_dma() is storing this value in an unsigned
    integer variable which is obviously not the correct thing to do.

    CRs-Fixed: 476578
    Change-Id: I39159e2f4f73c7f54de359cbe4faba5e902915ff
    Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>

commit 3c80de7e77505133601ef3b78507d33385f21dc0
Merge: fc94978 fe31963
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 20 00:19:43 2013 -0700

    Merge "EHCI: HSIC: Abort system suspend if controller is outside LPM"

commit fc94978be61795c4dc1e5463d41a03acc1ef4fc6
Merge: 6de4e23 853d198
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 20 00:19:34 2013 -0700

    Merge "USB: msm_otg: Allow low power mode with proprietary charger connected"

commit fe31963fab4c55e69314cf6f858fa4ccf5b14b68
Author: Pavankumar Kondeti <pkondeti@codeaurora.org>
Date:   Thu Apr 25 13:51:24 2013 +0530

    EHCI: HSIC: Abort system suspend if controller is outside LPM

    98089c0d commit (USB: Prevent system suspend when HSIC device
    is active) ensures that USB devices are auto suspended before
    system suspend begins.  Apply the same policy to HSIC controller
    platform device.  This will cover the corner case where controller
    and root hub are resumed after root hub system suspend routine
    returns success.

    CRs-Fixed: 482498
    Change-Id: I604b24775e1c2f52020161c236c44c20d579d5e0
    Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>

commit 6de4e23a90bdb0b3127c86887a239fff7dc3754a
Merge: 787cfa8 9a5e00e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sun May 19 20:38:29 2013 -0700

    Merge "usb: gadget: u_data_hsic: Fix NULL pointer dereference"

commit 853d198b83d136331de426bc14e0d08c15e3fe1b
Author: Pavankumar Kondeti <pkondeti@codeaurora.org>
Date:   Thu May 16 13:37:24 2013 +0530

    USB: msm_otg: Allow low power mode with proprietary charger connected

    When a proprietary (non-standard) charger is connected, enter low power
    mode.  There is no requirement to pull DP to VDP_SRC.  Hence allow PHY
    retention and power collapse. Enable PHY asynchronous interrupt for all
    cases when PHY comparators are used.

    CRs-Fixed: 482226
    Change-Id: I54976cabceaa06737e1e5a22313910a3db79ab26
    Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>

commit a3249e5142fcb90325cad0b7cb120dc595fe494d
Author: Rajkumar Raghupathy <raghup@codeaurora.org>
Date:   Thu May 16 15:48:14 2013 +0530

    ci13xxx_udc: Draw 100mA of current in unconfigured state

    As a part of usb enumeration, udc driver is currently notifying the pmic
    to draw 0mA of current during usb reset. The pmic driver notifies the
    charger driver that usb is in suspend state if <=2mA is notified.
    In 8930 targets with real battery connected, USB-CV Enumeration tests
    fail after some iterations. The failure logs show an error in SOF frame
    number and unexpected chirp sequence.

    As a part of USB Reset, instead of notifying PMIC to draw 0mA current,
    if we notify to draw 100mA current, then the USB-CV Ch-9 Enumeration
    failures are not seen. It seems there is some interference when PMIC stops
    charging during USB reset and causing the unexpected chirp sequence
    during USB Reset.

    In any case, as a part of USB reset or unconfigured state, device can draw
    upto 100mA of current from USB bus. Hence notify charging driver with
    100mA current draw as a part of USB reset interrupt.

    CRs-Fixed: 477655
    Change-Id: I2658bd570c500c62705e0c07384d6b5c900f407d
    Signed-off-by: Rajkumar Raghupathy <raghup@codeaurora.org>

commit 787cfa8682aeff10a847d89b5db983c6275b23a7
Merge: 0966dcc a6c55a2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat May 18 23:22:03 2013 -0700

    Merge "jbd2: fix assertion failure in jbd2_journal_flush()"

commit 0966dcc347c403745f7feb6f3dd0009ccdbaab51
Merge: 6973eca d83fddd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat May 18 23:21:55 2013 -0700

    Merge "ASoc: msm: Fix for pcm_read getting struck in alsa core."

commit 6973ecab6f88b5c3dfa2219fb5652c31a63e6a8f
Merge: ec81f97 0903cd4
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri May 17 20:20:50 2013 -0700

    Merge "msm_fb: hdmi: change HDMI_PHY_REG1 based on source."

commit 0903cd4e6641b887c706dfb3c9b986e941589ba0
Author: Abhishek Kharbanda <akharban@codeaurora.org>
Date:   Fri May 17 12:04:30 2013 -0700

    msm_fb: hdmi: change HDMI_PHY_REG1 based on source.

    Set value of HDMI_PHY_REG1[2:0] for output voltage swing control.

    CRs-Fixed: 488207
    Change-Id: I9aeba47491467a14a3141cf7688a95a2f43e80f5
    Signed-off-by: Abhishek Kharbanda <akharban@codeaurora.org>

commit 5f90221bcd65bec4e5c41307dd2d20e7da40159c
Author: Vidyakumar Athota <vathota@codeaurora.org>
Date:   Mon May 13 16:34:08 2013 -0700

    ASoC: msm: qdsp6: Fix for EVRC-B/WB vocoder rate

    Rate set in userspace for EVRC-B/WB vocoders are not
    propagated to DSP. Fix the issue by sending rate command to DSP

    Change-Id: I478f4afafac25dcb4b23964db24598205f9bcc05
    Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
    CRs-Fixed: 488084

commit ec81f9782423052cba9250bea6e58e6fca1921c1
Merge: c8f8b1c dcee9ad
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri May 17 09:01:24 2013 -0700

    Merge "msm: camera: fix bus vectors during client registeration."

commit c8f8b1c90c7f082c7ffd280352c739d456112826
Merge: 38c11a8 a9da2f1
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri May 17 09:01:02 2013 -0700

    Merge "msm: camera: fix antibanding issue on ov8825"

commit 38c11a8e20c095080919af8dc4d5fd09e90bb947
Merge: 61c8330 f1ab164
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri May 17 09:00:45 2013 -0700

    Merge "msm: kgsl: Add NULL check for next_event hook"

commit 61c8330bdc7568224566e3b5a65c43debca21fcc
Merge: 89e9750 a31aa79
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri May 17 09:00:33 2013 -0700

    Merge "msm: camera: Add NULL pointer check for regulator"

commit d83fddd777ef94b9e54cff18bbd4783bff14e181
Author: Sidipotu Ashok <sashok@codeaurora.org>
Date:   Fri May 17 15:13:30 2013 +0530

    ASoc: msm: Fix for pcm_read getting struck in alsa core.

    Advance hardware pointer by period size even if the packet
    coming from qdsp6 is of less size. QDSP6 sometimes
    (for rapid device switches) gives packets worth less
    than period size and this results in hw_ptr appl_ptr mismatch.

    CRs-Fixed: 486276
    CRs-Fixed: 488449
    Change-Id: I893f9a52e4cd507fd72e4a7aba3c5fa76527d1bf
    Signed-off-by: Sidipotu Ashok <sashok@codeaurora.org>

commit 2a647c91f09648733262756478d0befc1bc27287
Author: Alok Chauhan <alokc@codeaurora.org>
Date:   Tue Mar 12 18:34:43 2013 +0530

    spi_qsd: Add runtime PM support to SPI QSD driver

    Enable and disable the clocks and gpios to the SPI controller
    using runtime PM. This serves the dual purpose of reducing power
    Consumption a little and letting the core know when the device is idle.

    If runtime_pm is not supported, then make sure the device becomes
    active in first transaction after system-suspend, instead of
    system-resume.

    CRs-Fixed: 460988
    Change-Id: I2360b6f48491cd0e8e5f1ce54805079daf92e36b
    Signed-off-by: Alok Chauhan <alokc@codeaurora.org>

commit 3d6925940e69f83abf8ab89fa4380ca83259b6a7
Author: Simmi Pateriya <simmip@codeaurora.org>
Date:   Fri May 10 16:42:59 2013 +0530

    ASoC: wcd9310: Fix to reduce the delay while recording

    The current delay of 250ms is too long and can impact
    several usecases which involve TX path. Reduce the delay
    to 20ms as it is safe to do so. This delay was added to
    ensure low voltage for a while before turning on micbias
    for recording. Reason being, few headsets need voltage to
    be ramped up from 0V to micbias to enable microphone.

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

commit a6c55a2b39c0d825cbd40592ea8a20a32d0c4a6b
Author: Jan Kara <jack@suse.cz>
Date:   Fri Dec 21 00:15:51 2012 -0500

    jbd2: fix assertion failure in jbd2_journal_flush()

    The following race is possible between start_this_handle() and someone
    calling jbd2_journal_flush().

    Process A                              Process B
    start_this_handle().
      if (journal->j_barrier_count) # false
      if (!journal->j_running_transaction) { #true
        read_unlock(&journal->j_state_lock);
                                           jbd2_journal_lock_updates()
                                           jbd2_journal_flush()
                                             write_lock(&journal->j_state_lock);
                                             if (journal->j_running_transaction) {
                                               # false
                                             ... wait for committing trans ...
                                             write_unlock(&journal->j_state_lock);
        ...
        write_lock(&journal->j_state_lock);
        if (!journal->j_running_transaction) { # true
          jbd2_get_transaction(journal, new_transaction);
        write_unlock(&journal->j_state_lock);
        goto repeat; # eventually blocks on j_barrier_count > 0
                                             ...
                                             J_ASSERT(!journal->j_running_transaction);
                                               # fails

    We fix the race by rechecking j_barrier_count after reacquiring j_state_lock
    in exclusive mode.

    Reported-by: yjwsignal@empal.com
    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Cc: stable@vger.kernel.org

    CRs-Fixed: 468318
    Change-Id: Ibe417ee5c50e257b7521b5ce8bbfa4e13547d4c5
    Git-commit: d7961c7fa4d2e3c3f12be67e21ba8799b5a7238a
    Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
    Signed-off-by: Taniya Das <tdas@codeaurora.org>

commit 1c7a78d6f6d39a42f9ca470cbd36bc3640e289e9
Author: Naresh Jayaram <njayar@codeaurora.org>
Date:   Tue May 14 12:36:14 2013 +0530

    msm: wcnss: Dump PMIC regulator contol registers

    Dump PMIC registers which are related to WCNSS(RIVA)during the
    WCNSS SSR or WDI timeout.  This  information helps to check PMIC
    status during the SSR. This allows to debug multiple crash issues,
    where WCNSS SSR dumps are insufficient to conclude why FIQ is not
    reaching the WCNSS from HOST and why SPM is stuck.

    Change-Id: Ibcd767c8832e2df268591e03da93ccf1bd819c68
    CRs-fixed: 487483
    Signed-off-by: Naresh Jayaram <njayar@codeaurora.org>

commit a9da2f12c8cb83464816c446976770b4bf143ea8
Author: Aditya Jonnalagadda <ajonnala@codeaurora.org>
Date:   Wed May 15 17:22:09 2013 +0530

    msm: camera: fix antibanding issue on ov8825

    Sensor driver settings are changed to make sure the fps is
    not exactly 15 or 30 in zsl and non zsl modes in order to avoid
    stationary bands

    CRs-Fixed: 481736

    Change-Id: Ie340967adb9cc56bd608aa8f2c2de9eceae91feb
    Signed-off-by: Aditya Jonnalagadda <ajonnala@codeaurora.org>

commit 9a5e00e3b18467a1a99fd335a0e64e7039e96394
Author: Pavankumar Kondeti <pkondeti@codeaurora.org>
Date:   Thu May 16 14:50:26 2013 +0530

    usb: gadget: u_data_hsic: Fix NULL pointer dereference

    The port->in and port->out are reset to NULL during disconnect.  The
    connect work checks these variables before allocating requests.  Store
    port->in and port->out in local variables to free the already allocated
    requests before returning.

    CRs-Fixed: 488044
    Change-Id: Idcdc98e4237b646934c90077a1d58990e853e344
    Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>

commit a9c16aabc684d460e5db07be1d19d3343719e2ca
Author: Kevin Chan <ktchan@codeaurora.org>
Date:   Fri Apr 26 08:38:56 2013 -0700

    msm: camera: Move halt logic in case of overflow to ISR.

    Move the halt logic which includes AXI HALT and CAMIF Disable
    to ISR to start the recovery mechanism sooner.
    Add some protection in case of liveshot.

    Change-Id: I28ec462474524c0064cd7ecd4f77801cd494e514
    Signed-off-by: Kevin Chan <ktchan@codeaurora.org>
    Signed-off-by: Praveen Ac <praveenac@codeaurora.org>
    Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>

commit bf477754b95aa56cfb5053580c22b8072202777c
Author: Kevin Chan <ktchan@codeaurora.org>
Date:   Thu Apr 25 01:33:44 2013 -0700

    msm: camera: Add recovery routine for live snapshot.

    During live snapshot, if bus overflow happen, recovery routine will
    kick in and reset the hardware. At this point, the live snapshot
    might not be completed and application will continue to wait for
    the snapshot to complete. This change adds the logic to restart
    the snapshot process after recovery is completed.

    Change-Id: I9ba0a27ce53eb008a4af8d65a3f37a7cded03559
    Signed-off-by: Kevin Chan <ktchan@codeaurora.org>
    Signed-off-by: Praveen Ac <praveenac@codeaurora.org>
    Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>

commit 0485bc0a724befb952c2b9c3f7cd3a6a000448e7
Author: Kevin Chan <ktchan@codeaurora.org>
Date:   Fri Apr 19 22:29:55 2013 -0700

    msm: camera: Recovery through camif stop and overall reset.

    Add recovery mechanism in case of bus overflow. As part of the
    recovery, stop the CAMIF, reset the VFE and reload the AXI
    write masters and then restore the IRQ settings to VFE.

    Change-Id: Iba6576777f05135cc13c1ee0c9db764d35c7282a
    Signed-off-by: Kevin Chan <ktchan@codeaurora.org>
    Signed-off-by: Praveen Ac <praveenac@codeaurora.org>
    Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>

commit dcee9adf37c63ea8028310a18a46cfbf0388c7b6
Author: satyavaraprasad yerramsetti <satyav@codeaurora.org>
Date:   Wed May 15 17:23:04 2013 +0530

    msm: camera: fix bus vectors during client registeration.

    Initializing correct bus vectors during client registeration
    Signed-off-by: satyavaraprasad yerramsetti <satyav@codeaurora.org>

    Change-Id: I59ca54d370a885ce0baf4a3795dfafa9fba070ec
    Signed-off-by: satyavaraprasad yerramsetti <satyav@codeaurora.org>

commit b0fe3c9037669bc325190047795ece1765695eb2
Author: Asish Bhattacharya <asishb@codeaurora.org>
Date:   Wed May 15 08:41:08 2013 +0530

    ASoC: msm: Fix wrong wait_event_timeout timeout checks

    wait_event_timeout returns zero when there is a timeout.
    Change fixes the condition check to handle timeouts.

    Change-Id: I01184cce0c98a82bb205023b07dd4dd2d91b42ad
    CRs-Fixed: 487821
    Signed-off-by: Asish Bhattacharya <asishb@codeaurora.org>

commit f5cac71257887b1cc28a49ab93a53eb2a7f6780c
Author: Praveen AC <praveenac@codeaurora.org>
Date:   Wed Mar 6 12:59:09 2013 -0800

    msm: mdp: Revert MDP Port split changes

    Revert MDP changes to avoid bus overflow
    seen in camera usecases.

    Change-Id: I1c687750bd22c8f64ab28a500562cbfbcb6a6048
    Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>
    Signed-off-by: Praveen Ac <praveenac@codeaurora.org>

commit f1ab16497ab326e0c66284357fa2e91249c2b404
Author: Hareesh Gundu <hareeshg@codeaurora.org>
Date:   Mon May 13 20:25:53 2013 +0530

    msm: kgsl: Add NULL check for next_event hook

    KGSL driver needs to check that the function pointer
    is not NULL before calling the hook. next_event
    is an optional function not implemented by the 2d
    core. This fix ensures that optional and unimplemented
    function will not invoked by the driver.

    Change-Id: I687b028260e3ec304d973c6a5bded0a8fdbfb73b
    Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>

commit c1584b27feb5afb818d4c85931d7fa9c04ec83f0
Author: Nishant Pandit <npandit@codeaurora.org>
Date:   Tue May 14 06:07:54 2013 +0530

    msm: camera: Add null checks for stats module

    Add null checks in stats driver before accessing the
    data structures to avoid null pointer crash.

    Change-Id: I87639848e94e69e3fa020344f936e7cc182e2c66
    Signed-off-by: Nishant Pandit <npandit@codeaurora.org>

commit a5c3a3e46fe1bcbef21bd240478d0319c78c2a22
Author: Ajay Singh Parmar <aparmar@codeaurora.org>
Date:   Fri Apr 19 13:28:04 2013 +0530

    msm_fb: hdmi: Return proper clock get error code

    This change returns the proper error code while in probe and trying
    to get the required clock and fails. This is required for probe deferral
    support.

    Change-Id: Ief91b1f634c06d3679157313506b56e5948aa79c
    Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>

commit 144b62609c3c936a26364072ede93b916743e945
Author: Will Deacon <will.deacon@arm.com>
Date:   Thu May 9 21:41:21 2013 -0500

    ARM: mutex: use generic atomic_dec-based implementation for ARMv6+

    Commit a76d7bd96d65 ("ARM: 7467/1: mutex: use generic xchg-based
    implementation for ARMv6+") removed the barrier-less, ARM-specific
    mutex implementation in favour of the generic xchg-based code.

    Since then, a bug was uncovered in the xchg code when running on SMP
    platforms, due to interactions between the locking paths and the
    MUTEX_SPIN_ON_OWNER code. This was fixed in 0bce9c46bf3b ("mutex: place
    lock in contended state after fastpath_lock failure"), however, the
    atomic_dec-based mutex algorithm is now marginally more efficient for
    ARM (~0.5% improvement in hackbench scores on dual A15).

    This patch moves ARMv6+ platforms to the atomic_dec-based mutex code.

    Change-Id: I5cb600b15f891dc692356322b38cae1d692a084c
    Cc: Nicolas Pitre <nico@fluxnic.net>
    Signed-off-by: Will Deacon <will.deacon@arm.com>

commit a31aa792750227e5bbc94b9724be41996d98a1bc
Author: Aditya Jonnalagadda <ajonnala@codeaurora.org>
Date:   Thu May 9 11:35:49 2013 +0530

    msm: camera: Add NULL pointer check for regulator

    To avoid potential crashes, Null pointer check is added
    before regulator calls are made

    Change-Id: I3c745ff0600971d07d10b7a537e6f2375a2bf4ab
    Signed-off-by: Aditya Jonnalagadda <ajonnala@codeaurora.org>

commit 6411fc813c7446f9ac7590781cfa79d981dd8e99
Author: Sanket Khidkikar <sanketk@codeaurora.org>
Date:   Wed May 8 14:08:10 2013 -0700

    defconfig: Enable IPSec related configuration

    Configuration changes to enable IPSec tunnel/transport mode,
    user configuration via "ip xfrm" commands and necessary crypto algorithms

    Change-Id: Iadd773e2292cd804c8347c690490e0555f2d6a52
    CRs-Fixed: 455801
    Acked-by: Sireesh Gavini <sgavini@qti.qualcomm.com>
    Signed-off-by: Sanket Khidkikar <sanketk@codeaurora.org>

commit f44df5bb4b4e338858cfd3e4380b7e9482249bf4
Author: Hareesh Gundu <hareeshg@codeaurora.org>
Date:   Tue May 7 14:52:17 2013 +0530

    msm: kgsl: Insert kgsl idle for iommu-v1 when pagetables are changed.

    An idle is needed for iommu-v1 before programming both tlb registers
    and the pagetable register. Without this idle faults are observed on
    2D core because a process uses another processes pagetable.

    Change-Id: Ief14cd79b8e7ffaed413da49dc4b9e8416233186
    Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>

commit cdde1a87792a52274763eb006d326ca254ec3c63
Author: Manoj Rao <manojraj@codeaurora.org>
Date:   Fri Apr 12 18:37:14 2013 -0700

    msm: msm_fb: remove mmio access through mmap

    Disable access to mm io and add
    appropriate range checks to ensure valid accesses
    through framebuffer mmap. This prevents illegal
    access into memory.

    CRs-Fixed: 474706
    Change-Id: If25166f2732433ef967e99c716440030b567aae9
    Signed-off-by: Manoj Rao <manojraj@codeaurora.org>

Change-Id: I9f60bc049adb4e234157e2a82ec617b1a88f2245
Merge branch 'jellybean-mr2' of ssh://github.com/ChameleonOS/android_kernel_samsung_d2 into jellybean-mr2