Squashed commit of the following:

commit fac32d8befe12a42f0b59ecfac48e77ef5f8fc18
Merge: 8898127 b3ded44
Author: Wizard0f0s <jamie.gilmer@gmail.com>
Date:   Tue Sep 24 09:33:38 2013 -0400

    Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_device_samsung_manta into cm-10.2

    Also fix cos.dependencies to pull the existing CM repos for kernel and vendors

    Conflicts:
    	cm.dependencies
    	extract-files.sh

    Change-Id: I46b0721fc777ea0ef5f95bcc1e8635b4fa7a5f04

commit b3ded44697243ca8f3536d9615a0e769eed9a4d6
Author: Manuel Francisco Naranjo <naranjo.manuel@gmail.com>
Date:   Mon Jul 29 22:05:24 2013 -0300

    Enable BLE, GATT and SMP for Nexus 10

    For some reason Google disable BLE for Nexus 10 even though the hardware should
    support this feature.

    Change-Id: Id39116653a64b554332747e9b4e14a6d2edaae38

commit f29606d3eadb83cbbc051731fbb681d905bed003
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu Aug 15 17:40:15 2013 -0700

    manta: Enable USB audio support

     * Add card id and device mapping

    Change-Id: Ia66153cc16630d9792e7d7bbeadea19301139927

commit 428d6ce48568b52194785ee7ae37f61fddd55a49
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu Aug 15 16:27:49 2013 -0700

    manta: Fix blob list for JWR66V

    Change-Id: I4070af45941b8eabf4fc342caef2ad8db8c2c324

commit 34ea02a6018df3458ac78a2d51a5fc6a4285f612
Author: Stephen Smalley <sds@tycho.nsa.gov>
Date:   Thu Jul 25 14:00:24 2013 -0400

    Use our policy.

    Change-Id: I8e1a2a6ac3ab80957f96490248c2de26a2da0abc

commit 01cc0fa967784b2dba02c777c9cfe008ee783ad6
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Jul 30 00:00:13 2013 -0700

    manta: Fix storage configuration

     * Remove obsolete vold.fstab
     * Add USB storage to fstab

    Change-Id: I2f5ca2f308b485f89544b4974d645c637601127d

commit 4b3f3cd00950c8ecb6c0e049dc006a003b6f4be1
Author: Steve Kondik <shade@chemlab.org>
Date:   Mon Jul 29 23:43:11 2013 -0700

    manta: Update fingerprint

    Change-Id: Ic706947e76cdf60ff21156d0a0e3d6578b5a8238

commit 3c8a58b14ec3bfe44363c2bb9f8f43276c8092b2
Author: Steve Kondik <shade@chemlab.org>
Date:   Mon Jul 29 23:42:58 2013 -0700

    manta: Use cm-10.2 kernel branch

    Change-Id: I39e5bc21e6f9d297da334849faf8cc5568b49992

commit 64a1334c35e3f467957ea8c0f56c7c095aaeb5df
Author: Steve Kondik <shade@chemlab.org>
Date:   Mon Jul 29 00:38:46 2013 -0700

    manta: Remove invalid policy config

    Change-Id: I73119c925551d58078db0a8756e293db35f3a733

commit 5773a2aa9e1bf7aae1927df696109c2268b2de7d
Author: Steve Kondik <shade@chemlab.org>
Date:   Mon Jul 29 00:38:22 2013 -0700

    manta: Set recovery fstab version

    Change-Id: I4b33822d1116e380911a362e43836af16d4e4654

commit ad42adb5309f766d00d3e20833422047b1ccd070
Merge: fb9ff9c aa65e41
Author: Steve Kondik <shade@chemlab.org>
Date:   Sun Jul 28 01:26:19 2013 -0700

    Merge tag 'android-4.3_r2' of https://android.googlesource.com/device/samsung/manta into cm- 10.2

    Android 4.3 release 2

    Change-Id: Ib5eb52950d6b3ae5581cc58d0a04e0b4d3686854

commit fb9ff9c02c47ff638a2003f1302db409665b9fc8
Author: DvTonder <david.vantonder@gmail.com>
Date:   Fri Jul 5 09:29:23 2013 -0400

    Manta: Mark internal storage as primary

    Change-Id: I6c73b859736d48d7c2279beedda44ceb6a3d5146

commit aa65e41bb5e0c7c97ba582e7f07c0d465cea0d5a
Merge: 06f0c41 69c6d55
Author: The Android Automerger <android-build@google.com>
Date:   Wed Jun 12 05:55:44 2013 -0700

    merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev

commit 06f0c41b11607846739763d8eeb7838e81d85022
Author: JP Abgrall <jpa@google.com>
Date:   Tue Jun 11 11:21:34 2013 -0700

    prebuilt kernel (ashmem fix)

    446c9cf ashmem: avoid deadlock between read and mmap calls

    Bug: 9261835
    Change-Id: Ib6fd95b7f03fbddcc7851653fb5f64530921cbb8

commit 69c6d55ac05cb0c6e48e9e3d61cd5d9dacca50f9
Merge: 3f467de 20eed8f
Author: The Android Automerger <android-build@google.com>
Date:   Sun Jun 9 05:55:21 2013 -0700

    merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev

commit bc60af6f7d9b971d41ca218ba265ceb1ec34e793
Author: Nathan Grebowiec <njgreb@gmail.com>
Date:   Thu Jun 6 22:22:28 2013 -0500

    Use larger font in recovery

    Change-Id: Icaf939e27d21803cb22adeae54868a7b2284619b

commit 3f467de16ebad3b3f6c61a53fde0fcda2f0b7aa4
Author: Jean-Michel Trivi <jmtrivi@google.com>
Date:   Thu Jun 6 15:26:01 2013 -0700

    Fix regression on audio effects for VOICE_RECOGNITION source

    Add the missing assignments of the input channel mask.
    Fix the test on the input channel mask so audio effects can be
     enabled on the VOICE_RECOGNITION source, except when recording
     from the front+back mic.

    Bug 9320596

    Change-Id: Ibfbda2cec8444be59eaa34493cff6af97e9776dc

commit 20eed8fce25ff4a9cc99c00c5adf66c84101507c
Merge: e4fdeb0 d6815ff
Author: The Android Automerger <android-build@google.com>
Date:   Thu Jun 6 05:55:15 2013 -0700

    merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev

commit e4fdeb04e97a5e06a730649dde71813d920a7f16
Author: JP Abgrall <jpa@google.com>
Date:   Wed Jun 5 14:48:39 2013 -0700

    DO NOT MERGE: prebuilt kernel (jb-mr2. disable modules)

    108bd7e ARM: exynos: manta: disable modules support

    Bug: 8605311
    Change-Id: I2e796e845aa79d9c79a6e0fdfa09362d4a5f4b9a

commit d6815ffff03c907731d98daf75000c6b07899f33
Merge: 39c61e2 346312c
Author: The Android Automerger <android-build@google.com>
Date:   Wed Jun 5 09:57:21 2013 -0700

    merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev

commit 39c61e2020fed5ab8fb4df3d9c9c28f1e5de2f91
Author: JP Abgrall <jpa@google.com>
Date:   Mon Jun 3 13:25:34 2013 -0700

    DO NOT MERGE: prebuilt kernel (jb-mr2. ion shrink)

    76564fa gpu: ion: Also shrink memory cached in the deferred free list

    Bug: 8236940
    Bug: 8750243

    Change-Id: I7832913e5102dace4b999655b1520521dff36840

commit 346312c591fc46eba00a43fff1e43d218f5632b8
Merge: 6e84a8b afb4964
Author: The Android Automerger <android-build@google.com>
Date:   Thu May 16 05:55:19 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 6e84a8b22dbccf8f1d3c9430818b43acb10f80d8
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Wed May 15 13:22:12 2013 -0700

    manta: update kernel prebuilt

    9f45fdb Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    c3e1965 media: exynos: mfc: Increase number of mfc contexts

    Bug: 8950258

    Change-Id: I7be2bf3c5a288b976d0cc2d7a4cfd5d6265cccd5
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit afb496401acef61fbed8aa6c04286f022ae6d252
Merge: 57cd2bc 132c1a4
Author: The Android Automerger <android-build@android.com>
Date:   Wed May 15 05:55:08 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit e4956a09a120b29dd6e91d977574b1b66383da6e
Author: repo sync <gcondra@google.com>
Date:   Tue May 14 13:29:33 2013 -0700

    Add compatibility.te.

    This file is a clearinghouse for automatically generated policy,
    generated based on denials seen in the wild.

    Change-Id: I8fe56a61070598c99f2351032fa865ff52f0e72c

commit 132c1a4cfe3cf27ee5586b9177f0a9f04a6267bd
Merge: 8e3d297 48de45a
Author: The Android Automerger <android-build@android.com>
Date:   Tue May 14 12:57:49 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 57cd2bc6d5a82b135cef1cc5bd82a74f9897ba4b
Author: JP Abgrall <jpa@google.com>
Date:   Tue May 14 12:23:40 2013 -0700

    prebuilt kernel (fix for perf_event_open)

    7a974cd Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    02a3ad1 Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4
    8737f9a perf: Treat attr.config as u64 in perf_swevent_init()

    Bug: 8962304
    Change-Id: I72916fc9f1307a2f6dfa69001b8dba8c2c53d3ee

commit 8e3d2973b2f14714aeb976b4fb6c8edcea5bbc56
Author: Seong-Jeong JU <sj.joo@samsung.com>
Date:   Mon May 13 14:52:34 2013 -0700

    ARM: exynos: Manta: Change gps binary & xml for clearing a buganizer#8911981

    At latest binary, there was an issue(buganizer#8911981).
    So we received binary for resolving this from BROADCOM.

    There gps binaries include below,
    1. At gpsd boot, device will delete /data/gps/log/.
    2. Gps log function will be disabled.

    Bug: 8911981
    Change-Id: I684e83200c02cb4921a58955b81cffe389d7d52e
    Signed-off-by: Seong-Jeong JU <sj.joo@samsung.com>

commit 48de45ab428af58f6b7423c2359e8786b9bf219f
Merge: fa929ad 5784bc3
Author: The Android Automerger <android-build@android.com>
Date:   Mon May 13 05:55:10 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit fa929ad1c38f3f38312efa3d7e405d0a83f3e8c5
Merge: 20c90bc 509991a
Author: Ken Sumrall <ksumrall@android.com>
Date:   Sat May 11 04:42:45 2013 +0000

    Merge "manta: Disable logging by gpsd in /data/gps/logs" into jb-mr2-dev

commit 509991a01e7e2b2789b9274e04c59f7d72036781
Author: Ken Sumrall <ksumrall@android.com>
Date:   Fri May 10 20:07:24 2013 -0700

    manta: Disable logging by gpsd in /data/gps/logs

    Change-Id: I9920a7301555fc9c4d67226949b1fe9260ae19bc

commit 20c90bc0582848e515c430ab3f8503ed21d2dbd8
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Fri May 10 15:53:47 2013 -0700

    manta: update kernel prebuilt

    9728a8e Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    74212df Merge branch 'android-3.4' into android-exynos-3.4
    0548584 net: wireless: bcmdhd: Update to version 1.88.16

    Bug: 8494584

    Change-Id: I544a01216510ff6024f1a2f52cca53465b4e96b9
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit f116cadeaba9e776af041589678d7f924fbb5ec8
Merge: 0b89d35 744a823
Author: Matthew Xie <mattx@google.com>
Date:   Fri May 10 17:06:11 2013 +0000

    Merge "Clean up bluetooth le feature file" into jb-mr2-dev

commit 744a82354cd9fff334a958f530449371a689b18f
Author: Matthew Xie <mattx@google.com>
Date:   Thu May 9 17:18:00 2013 -0700

    Clean up bluetooth le feature file

    bug 8664724

    Change-Id: I6de99c130ef59b885d2d4799a7d3a5d9abe52eb2

commit 5784bc335ee9c6cfb6fe7c0370dd37f133038cc2
Author: Matthew Xie <mattx@google.com>
Date:   Wed May 8 18:56:27 2013 -0700

    Turn off BLE, GATT, and SMP of Bluetooth stack

    bug 8664724

    Change-Id: I3b3f76d165bb313273df4003d67bb9e6d8fe3b42

commit 0b89d356595010c3e813d11f55483ba3869ae8da
Merge: 89f737a 4e7fe45
Author: Matthew Xie <mattx@google.com>
Date:   Thu May 9 21:12:33 2013 +0000

    Merge "Turn off BLE, GATT, and SMP of Bluetooth stack" into jb-mr2-dev

commit 4e7fe4585530225137123a66351d1fd728ee9b65
Author: Matthew Xie <mattx@google.com>
Date:   Wed May 8 18:56:27 2013 -0700

    Turn off BLE, GATT, and SMP of Bluetooth stack

    bug 8664724

    Change-Id: I3b3f76d165bb313273df4003d67bb9e6d8fe3b42

commit 843d19ea310332b19ca4701f8f528070a26c3e1d
Author: JP Abgrall <jpa@google.com>
Date:   Fri May 3 15:30:55 2013 -0700

    prebuilt kernel (extra lowmemkill debug, fix sleep in DataAbort())

    a632e56 Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    8bc4da3 Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4
    f8f24e6 lowmemorykiller: make default lowmemorykiller debug message useful
    0e473ae ARM: fault: assume no context when IRQs are disabled during data abort.

    Bug: 8236940
    Bug: 8711265
    Change-Id: Ib889cf64b171e9b84fb6b52bb0d46a329f052b67

commit 89f737abd1a41699ed3d335d9ec9e90fa5e9d588
Author: JP Abgrall <jpa@google.com>
Date:   Fri May 3 15:30:55 2013 -0700

    prebuilt kernel (extra lowmemkill debug, fix sleep in DataAbort())

    a632e56 Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    8bc4da3 Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4
    f8f24e6 lowmemorykiller: make default lowmemorykiller debug message useful
    0e473ae ARM: fault: assume no context when IRQs are disabled during data abort.

    Bug: 8236940
    Bug: 8711265
    Change-Id: Ib889cf64b171e9b84fb6b52bb0d46a329f052b67

commit 3908b722bc905d91e8b984454b2c7e7939401bb7
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu May 2 10:01:19 2013 -0700

    new kernel prebuilt

    9cba2ed Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    03016ad video: s3c-fb: fix leak in initial framebuffer allocation
    3208e09 dma: pl330: fix dma lock-up error after dma flush

    Bug: 8236940
    Bug: 8438932

    Change-Id: If1d3ac39b617e4af38dd196895f67b4e00a02861
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit 6683e28f70be6becfe5c2471ad4dededf3b18171
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu May 2 10:01:19 2013 -0700

    new kernel prebuilt

    9cba2ed Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    03016ad video: s3c-fb: fix leak in initial framebuffer allocation
    3208e09 dma: pl330: fix dma lock-up error after dma flush

    Bug: 8236940
    Bug: 8438932

    Change-Id: If1d3ac39b617e4af38dd196895f67b4e00a02861
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit fb391fd1c5df828d6043d429e49b365f0fda44c1
Merge: ef9c97f ba910f5
Author: The Android Automerger <android-build@android.com>
Date:   Tue Apr 30 05:55:51 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit ef9c97f6327bf8c6bfece779c6fc3c61d61ed66a
Author: Robert Greenwalt <rgreenwalt@google.com>
Date:   Mon Apr 29 10:31:48 2013 -0700

    Remove wifi_p2p network.

    The state tracker wasn't really reporting p2p info anyway
    so this was broken and was confusing people as it used
    straight wifi as its type, giving 2 wifi networks and
    generating extra broadcasts.

    bug:8658717
    Change-Id: I3deb0c62e8112abb0bbd546f00f167d58047775f

commit ba910f5fb2a74cecbd4bed9a3b37df92c865ae3d
Merge: 27e83bd 907a69a
Author: The Android Automerger <android-build@android.com>
Date:   Mon Apr 29 05:55:14 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 907a69a07f9392bb4bebf1c045afe344d548ac60
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Thu Apr 25 19:10:42 2013 -0700

    manta: wlan: Add wpa_supplicant overlay file support

    Bug: 8725307

    Change-Id: I904e25d493aa34c32c38e953f08a306b7a5764ea
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit 27e83bdf38f5ac66ec160e9ee96ab0740eda306d
Author: Todd Poynor <toddpoynor@google.com>
Date:   Fri Apr 26 13:11:01 2013 -0700

    manta: prebuilt kernel (cpufreq governor spinlock init, missed idle timers)

    9141b7e Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    c0cfad5 Merge branch 'android-3.4' into android-exynos-3.4
    2e745d3 cpufreq: interactive: fix uninitialized spinlock
    d815346 ARM: exynos: prevent mct-comp timer from being set in the past
    f6b2e06 android: configs: Initial commit of Android config fragments

    Bug: 8732935
    Bug: 8657701
    Change-Id: Idc3c51731fa08f447807033ec96e19999ae28e73

commit 6ff9455d9f59c81c7a23fc3f745724b52d0a85d5
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Thu Apr 25 19:10:42 2013 -0700

    manta: wlan: Add wpa_supplicant overlay file support

    Bug: 8725307

    Change-Id: I904e25d493aa34c32c38e953f08a306b7a5764ea
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit 97a5d15c42d94acc68fe1b7d7c2690da5b181696
Merge: d58d10c d0a02f6
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Thu Apr 25 17:12:39 2013 +0000

    Merge "Add the ion chunk heap debug file to dumpstate" into jb-mr2-dev

commit d58d10c4c5a3ccab9aea9631f76fb7fb4043cf77
Author: JP Abgrall <jpa@google.com>
Date:   Wed Apr 24 17:53:13 2013 -0700

    prebuilt kernel (fixes: OABI sleep with no IRQs, ion shrinker)

    f05bbd8 ARM: exynos: manta: disable OABI_COMPAT to avoid sleep with IRQs off
    d8dbbca Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    79171ec Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4
    3ccc212 gpu: ion: Fix bug in ion shrinker

    Bug: 8711265
    Bug: 8236940
    Change-Id: I74b8533e98cc6c95a0d51e973e510a8c47598279

commit e247ee4c09740cb52f0cc16c428c9e99dc8a3c55
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Wed Apr 24 14:10:29 2013 -0700

    manta: kernel prebuilt

    57314dd Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    dd0ddca Merge branch 'android-3.4' into android-exynos-3.4
    ccf5d23 net: wireless: bcmdhd: Update to version 1.88.11
    9849aab net: wireless: bcmdhd: Enable full scan on PNO event
    357566d net: wireless: bcmdhd: Prevent recursive call of cfg80211_sched_scan_stopped

    Bug: 8683662, 8494584

    Change-Id: Ied64356ed2a0a634314584da466507850dc76f3c
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit d0a02f6f90884d92504318fbc68874eda40ba53f
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Apr 24 11:54:14 2013 -0700

    Add the ion chunk heap debug file to dumpstate

    Change-Id: Iea64e1711cdb1c78f9c7e5ab2c1133f452f59f9f
    Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>

commit fd14640ebaa1fa4de434248c3eb2a472bb1b3b1c
Merge: 641f4cc 8256417
Author: Erik Gilling <konkers@android.com>
Date:   Wed Apr 24 18:04:21 2013 +0000

    Merge "new kernel prebuilt" into jb-mr2-dev

commit 641f4ccfcf6cbca90d449f65822f89a2e7cd2218
Author: Martijn Coenen <maco@google.com>
Date:   Tue Apr 23 20:06:25 2013 -0700

    Manta: NFC: Increase power-on delay to 300ms.

    We've seen issues with NFCC firmware download
    when only giving the controller 50ms after power-on -
    usually the firmware download would hang after the
    signature frame. Most likely some parts of the chip
    are not fully up yet.

    Increase to 300ms to fix.

    Bug: 8700281
    Change-Id: I0f1dfd25cf33aa1481ca39d28e431285d97e390f

commit 3c9b004d18b73f9aa25d5ae174f7ba256ed0f53c
Merge: 9d5ab41 fc540a1
Author: Matthew Xie <mattx@google.com>
Date:   Tue Apr 23 22:48:54 2013 +0000

    Merge "Copy android.hardware.bluetooth_le.xml permission file" into jb-mr2-dev

commit 8256417a92ec7c6d5e8844871037be88b9a0b88b
Author: Erik Gilling <konkers@android.com>
Date:   Tue Apr 23 13:58:00 2013 -0700

    new kernel prebuilt

    includes:
    5f7ec76 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    4a7eb23 Merge branch 'android-3.4' into android-exynos-3.4
    9360867 gpu: arm: t6xx: Fixed out of order timestamps
    6460ff8 trace/events: fix gpu event timestamp formatting
    6a3b630 ARM: convert build of appended dtb zImage to list of dtbs
    Bug: 8660509

    Change-Id: Ic737dbe0f43b2c5ae4dc0055ddf8c3830ed87da1
    Signed-off-by: Erik Gilling <konkers@android.com>

commit fc540a13935aca58cf353e7901970fefcd373265
Author: Matthew Xie <mattx@google.com>
Date:   Tue Apr 23 12:04:38 2013 -0700

    Copy android.hardware.bluetooth_le.xml permission file

    bug 8369273

    Change-Id: I5ce43c90bd46f3e2cc1dd334fe81d69ad80f4b01

commit 9d5ab41e2b679c9a12851889e682ad3c5a551a42
Merge: 17337fd 715cc3e
Author: Jesse Hall <jessehall@google.com>
Date:   Tue Apr 23 10:09:38 2013 +0000

    Merge "Report device as OpenGL ES 3.0 capable" into jb-mr2-dev

commit 17337fdc042238bb5f2a28d32fbbc8c84d75092f
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Mon Apr 22 17:39:29 2013 -0700

    manta: kernel prebuilt

    69e3b5d ASoC: SAMSUNG: fix AIF2 clocking issues

    Bug: 8634536

    Change-Id: I91774e8e8388624ee6af66c6f79e6ec3e2ff976a
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit 9de0c230a245b3bd11e4ca768560349f43d0f885
Merge: 63ca209 4f1aece
Author: Eric Laurent <elaurent@google.com>
Date:   Tue Apr 23 00:27:26 2013 +0000

    Merge "audio: fix SCO issues" into jb-mr2-dev

commit 4f1aece0af007826091ef439557fc0fdadc68dd4
Author: Eric Laurent <elaurent@google.com>
Date:   Fri Apr 19 17:10:25 2013 -0700

    audio: fix SCO issues

    SCO pcm streams must be active only when either playback or capture
    is active on a SCO device. As the output device is not always reset
    when a stream stops, the SCO pcm streams would remain active until
    a new device selection is received.

    Also manage SCO pcm streams when capture only is active. Previous
    implementation was only starting SCO pcm streams if the playback
    device was SCO.

    Bug: 8634536
    Change-Id: Icf65583f901d63cf1b469f4b03c9ffc84eefc41f

commit 63ca209f91c3fcc827b18ac752b1ad11198372b9
Author: JP Abgrall <jpa@google.com>
Date:   Mon Apr 22 12:26:29 2013 -0700

    prebuilt kernel (erratum 79818)

    b042dbd ARM: exynos: manta: enable ERRATA_798181 workaround
    cf3eac0 ARM: 7684/1: errata: Workaround for Cortex-A15 erratum 798181 (TLBI/DSB operations)
    6d90778 ARM: backport a bunch of mm changes for erratum 798181

    Bug: 8322896
    Change-Id: Ic7379772db46ab8c7582242a9ae634e33afbf1d9

commit 16c261e5c16641b9ffa843e5f457bb5c10265fab
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Thu Apr 18 22:51:37 2013 -0700

    New kernel prebuilt

    03fd82b Merge remote-tracking branch 'exynos/android-exynos-3.4' into HEAD
    a1b3110 Merge remote-tracking branch 'common/android-3.4' into HEAD
    adfb519 gpu: ion: ion_chunk_heap: Zero chunk heap memory at creation time
    6e79f70 Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-ex
    4705968 Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.
    c8a0118 f_fs: ffs_func_free: cleanup requests allocated by autoconfig

    Bug:8302702
    Bug:8659094
    Change-Id: Ic11ad4ec793a534bf5f2eba92630c7e15a8b681e
    Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>

commit 87d6cc0cfdabeb5cdd8855b81d2d19003b50118f
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Wed Apr 17 12:31:13 2013 -0700

    manta: kernel prebuilt

    dc5679f ASoC: SAMSUNG: Add MIC detection through ADC line

    Bug: 8570798

    Change-Id: I4569be91316e8dc3f2da383f8d39e453de577adf
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit 715cc3eed34ea84f4999efe7c1a7cf6b47774cce
Author: Jesse Hall <jessehall@google.com>
Date:   Fri Mar 15 12:42:12 2013 -0700

    Report device as OpenGL ES 3.0 capable

    Bug: 848773
    Change-Id: Ia8c955151a9b43ede2cb6d9c1b85608d25a9344a

commit c97552f90e77077a094323ff82a731d96f0833d2
Author: Erik Gilling <konkers@android.com>
Date:   Tue Apr 16 13:16:12 2013 -0700

    new kernel prebuilt

    includes:
    b63f476 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    e82b7ed mali: ARM Mali driver kernel trunk sync [revision 82822 (Fiddlehead)]
    e399d60 Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    be995d8 Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4
    ba6e957 gpu: ion: fix kfree/list_del order
    11df327 Revert "ARM: EXYNOS: add packed write capability for smdk5250"
    97da850 Revert "mmc: add packed command feature of eMMC4.5"
    1bfc8ad Revert "mmc: support packed write command for eMMC4.5 device"
    d6622df Revert "mmc: support packed read command for eMMC4.5 device"

    Change-Id: I73eee00be850c38922940a6b3ffdc2affa23d08d
    Signed-off-by: Erik Gilling <konkers@android.com>

commit 74ee30b28399422875ee56d919fd92944f49b7a9
Merge: 60a3d5b be955af
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Apr 15 10:49:06 2013 -0700

    am be955af2: Reconcile with jb-mr2-release - do not merge

    * commit 'be955af2300fd352ddd831988e66bdcae8a7c862':

commit be955af2300fd352ddd831988e66bdcae8a7c862
Merge: 633e8df 20f364f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Apr 15 10:45:57 2013 -0700

    Reconcile with jb-mr2-release - do not merge

    Change-Id: I22c81fbb166326b331a5a74b43fb3fc6269e30ef

commit 20f364f6f47f024b60e402cedb87961250873be7
Merge: d89367b 299dc25
Author: The Android Automerger <android-build@android.com>
Date:   Mon Apr 15 05:55:18 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 60a3d5b53bd08b1074da5cb5aca41cb2e5bd8c9e
Merge: f436792 633e8df
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Apr 12 11:26:32 2013 -0700

    am 633e8df3: Fine-tune manta extractors

    * commit '633e8df3a03d003560a51c179cc2dd763fc670c1':
      Fine-tune manta extractors

commit 633e8df3a03d003560a51c179cc2dd763fc670c1
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Apr 12 11:21:58 2013 -0700

    Fine-tune manta extractors

    Change-Id: Iff35fa7bbf7dd34615b4e4e15e2ae49d0d2d04f1

commit f4367922d1c560d34d45a27e3672caa024f243d2
Merge: 15bdba5 1a40bd3
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Apr 11 20:25:53 2013 -0700

    am 1a40bd3f: Package binaries for JB MR2

    * commit '1a40bd3f56256b36ab9bb5771dbd7d6aa339a210':
      Package binaries for JB MR2

commit 1a40bd3f56256b36ab9bb5771dbd7d6aa339a210
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Apr 11 16:59:24 2013 -0700

    Package binaries for JB MR2

    Change-Id: If89c66bdf4502c153b8ec88ec37ed98e732d3c99

commit 15bdba5a8a8d24aef8085f0451ec5fecd6e6b979
Merge: 052c0be c3d32cc
Author: JP Abgrall <jpa@google.com>
Date:   Thu Apr 11 16:26:54 2013 -0700

    am c3d32cc7: am d89367bf: prebuilt kernel (nfc fix, sysrq-t fix)

    * commit 'c3d32cc7c28ffcdc7b0565b3b91f65719647ad59':
      prebuilt kernel (nfc fix, sysrq-t fix)

commit c3d32cc7c28ffcdc7b0565b3b91f65719647ad59
Merge: cfe9566 d89367b
Author: JP Abgrall <jpa@google.com>
Date:   Thu Apr 11 16:24:13 2013 -0700

    am d89367bf: prebuilt kernel (nfc fix, sysrq-t fix)

    * commit 'd89367bf67d52871e2f025b5ce79038f34fa021c':
      prebuilt kernel (nfc fix, sysrq-t fix)

commit d89367bf67d52871e2f025b5ce79038f34fa021c
Author: JP Abgrall <jpa@google.com>
Date:   Thu Apr 11 15:36:34 2013 -0700

    prebuilt kernel (nfc fix, sysrq-t fix)

    fc08938 sched: touch the hw watchdog similarly to the nmi one.
    e34a633 drivers: watchdog: allow the watchdog to be pinged
    f7e0f0b Manta: NFC: Fix type-casting bug.

    Bug: 8398381
    Bug: 8598228
    Change-Id: I1d15540d9df29a1d4bf5769b4040a8bde0dc08b5

commit 052c0be183e32b4d15b750e025b87cf4e4a10bc3
Merge: e045f44 cfe9566
Author: Ken Sumrall <ksumrall@android.com>
Date:   Thu Apr 11 14:58:36 2013 -0700

    am cfe95662: am 0db39ee9: Merge "Remove deprecated recovery.fstab." into jb-mr2-dev

    * commit 'cfe95662185fb73d62e7fe76ee063d1552379caa':
      Remove deprecated recovery.fstab.

commit cfe95662185fb73d62e7fe76ee063d1552379caa
Merge: c050119 0db39ee
Author: Ken Sumrall <ksumrall@android.com>
Date:   Thu Apr 11 14:20:20 2013 -0700

    am 0db39ee9: Merge "Remove deprecated recovery.fstab." into jb-mr2-dev

    * commit '0db39ee9cba293124b8b54249335b502c33e9b1f':
      Remove deprecated recovery.fstab.

commit 0db39ee9cba293124b8b54249335b502c33e9b1f
Merge: 534b99c f4b5c42
Author: Ken Sumrall <ksumrall@android.com>
Date:   Thu Apr 11 21:14:22 2013 +0000

    Merge "Remove deprecated recovery.fstab." into jb-mr2-dev

commit e045f447235e63186c90e1ecb4a18a52e087b964
Merge: 3529d4a c050119
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Apr 11 07:47:11 2013 -0700

    am c0501194: Reconcile with jb-mr2-release - do not merge

    * commit 'c05011940b08d4328ddafb27450e8a76e2be87b5':

commit c05011940b08d4328ddafb27450e8a76e2be87b5
Merge: 7ddd90e 299dc25
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Apr 11 07:45:02 2013 -0700

    Reconcile with jb-mr2-release - do not merge

    Change-Id: Ibf0d836a424eef68dab79fc3a2e7d86920e2e28e

commit 299dc25e38e7b8559bda462b6d91a44ed5b51409
Merge: 534b99c 3105011
Author: The Android Automerger <android-build@android.com>
Date:   Thu Apr 11 05:55:12 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit f4b5c42247ba61a1ca17debe739d099dea38196a
Author: Ken Sumrall <ksumrall@android.com>
Date:   Wed Apr 10 20:41:47 2013 -0700

    Remove deprecated recovery.fstab.

    Change-Id: I6ff2226be49dc136a86807e2d4c6f9828608664b

commit 3529d4a8564adf4ddab1b477bfd7667b99439dad
Merge: 20d15ad 7ddd90e
Author: Erik Gilling <konkers@android.com>
Date:   Wed Apr 10 11:34:34 2013 -0700

    am 7ddd90e2: am 534b99c2: new kernel prebuilt

    * commit '7ddd90e2654e2fb1a36a03e6f02c28752ff9d5ea':
      new kernel prebuilt

commit 7ddd90e2654e2fb1a36a03e6f02c28752ff9d5ea
Merge: 2d3c511 534b99c
Author: Erik Gilling <konkers@android.com>
Date:   Wed Apr 10 11:31:11 2013 -0700

    am 534b99c2: new kernel prebuilt

    * commit '534b99c23d767de17488a69e5421be1cb2112d06':
      new kernel prebuilt

commit 534b99c23d767de17488a69e5421be1cb2112d06
Author: Erik Gilling <konkers@android.com>
Date:   Wed Apr 10 11:26:11 2013 -0700

    new kernel prebuilt

    includes:
    f0e62a0 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    f3a764d mali: ARM Mali driver kernel trunk sync [revision 82409 (Edamame)]
    fd1d260 Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4
    bb02922 ARM: EXYNOS5: Work around sysfs/.../rate clk_get_rate() hang
    b6d0c39 net: wireless: bcmdhd: Update to version 1.88.10
    bd91f6b netfilter: qtaguid: rate limit some of the printks
    485023a net: wireless: bcmdhd: Fix WEP-104 authentication

    Bug: 8567975
    Bug: 8491181
    Bug: 8197602
    Change-Id: I583032c024e258f88f57dcf10223e3be10119eee
    Signed-off-by: Erik Gilling <konkers@android.com>

commit 20d15ad0f754ecadfd4ef96e40c8f311b5f8775a
Merge: f1da633 2d3c511
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Apr 10 10:08:29 2013 -0700

    am 2d3c511c: Reconcile with jb-mr2-release - do not merge

    * commit '2d3c511cb380e56e1f8c716b6dddc135007958e6':

commit 2d3c511cb380e56e1f8c716b6dddc135007958e6
Merge: 7ff90d2 3105011
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Apr 10 10:05:24 2013 -0700

    Reconcile with jb-mr2-release - do not merge

    Change-Id: I8447f2064ba2ffd534cbb212830241ac25957e65

commit 3105011f03cef1a6d6ff19015032715de6785c5a
Merge: 25305b9 df579d2
Author: The Android Automerger <android-build@android.com>
Date:   Wed Apr 10 05:55:14 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit f1da633a771ee42a21ad56e7a74583ea2c69656d
Merge: 94209d8 7ff90d2
Author: Ying Wang <wangying@google.com>
Date:   Tue Apr 9 22:25:16 2013 -0700

    am 7ff90d26: am 25305b9e: Add liblog

    * commit '7ff90d2691d943e835fb320984588312a3fb336b':
      Add liblog

commit 7ff90d2691d943e835fb320984588312a3fb336b
Merge: 7a4d6e8 25305b9
Author: Ying Wang <wangying@google.com>
Date:   Tue Apr 9 22:21:25 2013 -0700

    am 25305b9e: Add liblog

    * commit '25305b9e712020ece453a45c34af27fd5fc83abf':
      Add liblog

commit 25305b9e712020ece453a45c34af27fd5fc83abf
Author: Ying Wang <wangying@google.com>
Date:   Tue Apr 9 21:45:26 2013 -0700

    Add liblog

    Bug: 8580410
    Change-Id: I6845b03f1086ed1b0c7879119e5a170361ffe368

commit df579d2038c0539bbb40c4b5ef3a23bd21f2418e
Merge: faba44d bb7e66e
Author: The Android Automerger <android-build@android.com>
Date:   Tue Apr 9 05:55:13 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 94209d8e8c85f3672c739d37820952cf6c15782b
Merge: cda0f74 7a4d6e8
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Apr 8 13:40:33 2013 -0700

    am 7a4d6e8f: Reconcile with jb-mr2-release - do not merge

    * commit '7a4d6e8faf0fdc0ce5a4806d4bfac5c5c2cc80c7':

commit 7a4d6e8faf0fdc0ce5a4806d4bfac5c5c2cc80c7
Merge: deabf2b bb7e66e
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Apr 8 13:35:46 2013 -0700

    Reconcile with jb-mr2-release - do not merge

    Change-Id: I186a1ef83a642fd909857a6a4e7312844fc55b44

commit cda0f7453b8a0fde3d0d01de67e6561b2aaa7c87
Merge: f2ef603 deabf2b
Author: JP Abgrall <jpa@google.com>
Date:   Mon Apr 8 10:31:14 2013 -0700

    am deabf2b0: am faba44dd: prebuilt kernel (stable mergedown 3.4.39, security fix for CVE-2013-0914)

    * commit 'deabf2b080fc811c759d31beba559496112dab65':
      prebuilt kernel (stable mergedown 3.4.39, security fix for CVE-2013-0914)

commit deabf2b080fc811c759d31beba559496112dab65
Merge: f393929 faba44d
Author: JP Abgrall <jpa@google.com>
Date:   Mon Apr 8 10:27:20 2013 -0700

    am faba44dd: prebuilt kernel (stable mergedown 3.4.39, security fix for CVE-2013-0914)

    * commit 'faba44dd985195cd7e42d1e8eabee1b84b7d496e':
      prebuilt kernel (stable mergedown 3.4.39, security fix for CVE-2013-0914)

commit bb7e66e48d48fcd42501cfa4d4886e51476764b8
Merge: 0bceb2d 82a6363
Author: The Android Automerger <android-build@android.com>
Date:   Mon Apr 8 05:55:21 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit faba44dd985195cd7e42d1e8eabee1b84b7d496e
Author: JP Abgrall <jpa@google.com>
Date:   Sun Apr 7 16:34:10 2013 -0700

    prebuilt kernel (stable mergedown 3.4.39, security fix for CVE-2013-0914)

    Bug: 8531623
    (fixed for CVE-2013-0914 in  44ddae4 signal: always clear sa_restorer on execve)

    0b847a4 Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    5864848 Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4
    d80428a Merge tag 'v3.4.39' into android-3.4
    cbfed95 Linux 3.4.39
    29fcbcb Revert "xen/blkback: Don't trust the handle from the frontend."
    aa5ec22 bonding: get netdev_rx_handler_unregister out of locks
    c843819 smsc75xx: fix jumbo frame support
    74bed69 pch_gbe: fix ip_summed checksum reporting on rx
    f0180de net: add a synchronize_net() in netdev_rx_handler_unregister()
    5afd933 ks8851: Fix interpretation of rxlen field.
    567a4ac ipv6: don't accept node local multicast traffic from the wire
    6a51997 ipv6: fix bad free of addrconf_init_net
    df19106 ipv6: don't accept multicast traffic with scope 0
    ccb926f DM9000B: driver initialization upgrade
    98b3a57 atl1e: drop pci-msi support because of packet corruption
    d97bcfa aoe: reserve enough headroom on skbs
    a930484 net: fix *_DIAG_MAX constants
    71ec40e drivers: net: ethernet: cpsw: use netif_wake_queue() while restarting tx queue
    86f1b8c drivers: net: ethernet: davinci_emac: use netif_wake_queue() while restarting tx queue
    ae8c63b bonding: fix disabling of arp_interval and miimon
    d98ea18 bonding: fix miimon and arp_interval delayed work race conditions
    b11b7d9 bonding: remove already created master sysfs link on failure
    fbb7347 unix: fix a race condition in unix_release()
    b9f3bf1 thermal: shorten too long mcast group name
    a834179 8021q: fix a potential use-after-free
    d1f60c6 tcp: undo spurious timeout after SACK reneging
    21b56e0 tcp: preserve ACK clocking in TSO
    8787606 sky2: Threshold for Pause Packet is set wrong
    27d365a sky2: Receive Overflows not counted
    a897b79 net: remove a WARN_ON() in net_enable_timestamp()
    7b7cf9f tracing: Prevent buffer overwrite disabled for latency tracers
    2f6b6e2 tracing: Protect tracer flags with trace_types_lock
    2457a40 ext4: use atomic64_t for the per-flexbg free_clusters count
    46c14b9 ext4: convert number of blocks to clusters properly
    4025b05 efivars: Handle duplicate names from get_next_variable()
    5c44ddd efivars: explicitly calculate length of VariableName
    2ee4a8e Btrfs: fix space leak when we fail to reserve metadata space
    3c7fe7b drm/i915: Don't clobber crtc->fb when queue_flip fails
    49e6724 nfsd4: reject "negative" acl lengths
    c14d752 ARM: cns3xxx: fix mapping of private memory region
    ccb3d56 loop: prevent bdev freeing while device in use
    39d4978 usb: gadget: udc-core: fix a regression during gadget driver unbinding
    d50597f Btrfs: don't drop path when printing out tree errors in scrub
    1c7b6ea Btrfs: limit the global reserve to 512mb
    84519c0 Btrfs: fix race between mmap writes and compression
    e18e866 usb: xhci: Fix TRB transfer length macro used for Event TRB.
    afc3097 net/irda: add missing error path release_sock call
    75e4839 pnfs-block: removing DM device maybe cause oops when call dev_remove
    e92c5ef mwifiex: cancel cmd timer and free curr_cmd in shutdown process
    8630260 vt: synchronize_rcu() under spinlock is not nice...
    840d38a usb: ftdi_sio: Add support for Mitsubishi FX-USB-AW/-BD
    d32cdd3 tty: atmel_serial_probe(): index of atmel_ports[] fix
    2f21ae2 xen-blkback: fix dispatch_rw_block_io() error path
    119016c xen/blkback: correctly respond to unknown, non-native requests
    2c0260b iommu/amd: Make sure dma_ops are set for hotplug devices
    60f18f4 tg3: fix length overflow in VPD firmware parsing
    554293b b43: N-PHY: use more bits for offset in RSSI calibration
    123dad7 b43: A fix for DMA transmission sequence errors
    0883afbb b43: N-PHY: increase initial value of "mind" in RSSI calibration
    e401e13 rtlwifi: usb: add missing freeing of skbuff
    698d31b HID: usbhid: quirk for Realtek Multi-card reader
    5050633 ath9k_hw: revert chainmask to user configuration after calibration
    bb4619e can: sja1000: fix define conflict on SH
    cde9833 sysfs: handle failure path correctly for readdir()
    01fadbb sysfs: fix race between readdir and lseek
    d8022cb staging: comedi: s626: fix continuous acquisition
    c643e01 Bluetooth: Add support for Dell[QCA 0cf3:817a]
    42c4b74 Bluetooth: Add support for Dell[QCA 0cf3:0036]
    caef33a Bluetooth: Fix not closing SCO sockets in the BT_CONNECT2 state
    c625222 tile: expect new initramfs name from hypervisor file system
    66156e6 SUNRPC: Add barriers to ensure read ordering in rpc_wake_up_task_queue_locked
    30e8f45 kernel/signal.c: use __ARCH_HAS_SA_RESTORER instead of SA_RESTORER
    556ba70 signal: Define __ARCH_HAS_SA_RESTORER so we know whether to clear sa_restorer
    f3b5af9 Linux 3.4.38
    1014986 asus-laptop: Do not call HWRS on init
    553ce45 rt2x00: error in configurations with mesh support disabled
    023eae6 exec: use -ELOOP for max recursion depth
    2f7dea3 i915: initialize CADL in opregion
    5fb9149 tools: hv: Netlink source address validation allows DoS
    66de393 udf: avoid info leak on export
    19b4376 isofs: avoid info leak on export
    b647ebe key: Fix resource leak
    8b55bf5 USB: io_ti: fix get_icount for two port adapters
    00de47e USB: garmin_gps: fix memory leak on disconnect
    bc914c3 udf: Fix bitmap overflow on large filesystems with small block size
    5899ef0 nohz: Make tick_nohz_irq_exit() irq safe
    cbff2b6 USB: serial: fix interface refcounting
    10a00e3 USB: cdc-acm: fix device unregistration
    d581bb3 USB: xhci: correctly enable interrupts
    31e8d29 USB: xhci - fix bit definitions for IMAN register
    56d833d x86-64: Fix the failure case in copy_user_handle_tail()
    8d96fce clockevents: Don't allow dummy broadcast timers
    3d2e742 IPoIB: Fix send lockup due to missed TX completion
    2bb5c2c ext4: fix data=journal fast mount/umount hang
    120c355 usb-storage: add unusual_devs entry for Samsung YP-Z3 mp3 player
    d24f139 ext4: fix the wrong number of the allocated blocks in ext4_split_extent()
    ac4f52e jbd2: fix use after free in jbd2_journal_dirty_metadata()
    056f8c8 cifs: ignore everything in SPNEGO blob after mechTypes
    f16d21e drm/radeon/benchmark: make sure bo blit copy exists before using it
    ae7952e drm/radeon: add support for Richland APUs
    2cf470d drm/radeon: add Richland pci ids
    6e8d94d target/iscsi: Fix mutual CHAP auth on big-endian arches
    bea7cce mm/hugetlb: fix total hugetlbfs pages count when using memory overcommit accouting
    612dade KMS: fix EDID detailed timing frame rate
    2c5d816 KMS: fix EDID detailed timing vsync parsing
    e03f8b8 drm/i915: bounds check execbuffer relocation count
    5cec2bb mwifiex: fix potential out-of-boundary access to ibss rate table
    5a468a7 rtlwifi: rtl8192cu: Fix problem that prevents reassociation
    b903216 rtlwifi: rtl8192cu: Fix schedule while atomic bug splat
    52cecaa tracing: Fix free of probe entry by calling call_rcu_sched()
    1e3b58b tracing: Fix race in snapshot swapping
    74a523f drm/i915: restrict kernel address leak in debugfs
    cb8a094 ALSA: snd-usb: mixer: ignore -EINVAL in snd_usb_mixer_controls()
    184f526 ALSA: snd-usb: mixer: propagate errors up the call chain
    e978145 ALSA: hda - Fix typo in checking IEC958 emphasis bit
    184e91c ALSA: hda/cirrus - Fix the digital beep registration
    46a84db sfc: Only use TX push if a single descriptor is to be written
    70a3336 sfc: Disable soft interrupt handling during efx_device_detach_sync()
    bea3099 sfc: Detach net device when stopping queues for reconfiguration
    4b8fd2a sfc: Fix efx_rx_buf_offset() in the presence of swiotlb
    56bed2f sfc: Properly sync RX DMA buffer when it is not the last in the page
    41ade8e sfc: Correctly initialise reset_method in siena_test_chip()
    2672f1c sfc: Avoid generating over-length MC_CMD_FLUSH_RX_QUEUES request
    ab2c550 sfc: Disable VF queues during register self-test
    3ad735c sfc: Fix timekeeping in efx_mcdi_poll()
    54ad9a8 sfc: lock TX queues when calling netif_device_detach()
    e0992b7 sfc: Work-around flush timeout when flushes have completed
    6099070d sfc: Really disable flow control while flushing
    4d64cdb sfc: Fix MCDI structure field lookup
    9a17de1 sfc: Add parentheses around use of bitfield macro arguments
    0f1ac29 sfc: Convert firmware subtypes to native byte order in efx_mcdi_get_board_cfg()
    be29fc5 sfc: Do not attempt to flush queues if DMA is disabled
    1280938 inet: limit length of fragment queue hash table bucket lists
    05bec9d bnx2x: fix occasional statistics off-by-4GB error
    c2abe8a vhost/net: fix heads usage of ubuf_info
    08ebc8f rtnetlink: Mask the rta_type when range checking
    b6da578 tcp: fix skb_availroom()
    6a2d122 ipv4: fix definition of FIB_TABLE_HASHSZ
    ca42fad sctp: don't break the loop while meeting the active_path so as to find the matched transport
    0aa8bf9 sctp: Use correct sideffect command in duplicate cookie handling
    147289d tg3: 5715 does not link up when autoneg off
    e7778a6 bonding: don't call update_speed_duplex() under spinlocks
    b52f067 netconsole: don't call __netpoll_cleanup() while atomic
    7436bcf net/ipv4: Ensure that location of timestamp option is stored
    1c93c2e sunsu: Fix panic in case of nonexistent port at "console=ttySY" cmdline option
    3ff8924 Revert "USB: EHCI: don't check DMA values in QH overlays"
    dbfe085 Linux 3.4.37
    7cba6ae 6lowpan: Fix endianness issue in is_addr_link_local().
    32ceecc dcbnl: fix various netlink info leaks
    78d3a46 rtnl: fix info leak on RTM_GETLINK request for VF devices
    47d7ed1 ipv6: stop multicast forwarding to process interface scoped addresses
    c7a226b bridging: fix rx_handlers return code
    8c6292a netlabel: correctly list all the static label mappings
    e86429f macvlan: Set IFF_UNICAST_FLT flag to prevent unnecessary promisc mode.
    094b503 tun: add a missing nf_reset() in tun_net_xmit()
    8bd2b8fa tcp: fix double-counted receiver RTT when leaving receiver fast path
    6202fe4 net: ipv6: Don't purge default router if accept_ra=2
    2b2066c rds: limit the size allocated by rds_message_alloc()
    136d76d l2tp: Restore socket refcount when sendmsg succeeds
    0530082 drm/i915: Increase the RC6p threshold.
    51dfcbf loopdev: remove an user triggerable oops
    187c2bd loopdev: fix a deadlock
    d72b4f9 block: use i_size_write() in bd_set_size()
    969ff7d hwmon: (sht15) Fix memory leak if regulator_enable() fails
    81da76a drm/i915: EBUSY status handling added to i915_gem_fault().
    cb505e2 atmel_lcdfb: fix 16-bpp modes on older SOCs
    a40a945 btrfs: use rcu_barrier() to wait for bdev puts at unmount
    59c0110 s390/mm: fix flush_tlb_kernel_range()
    8a52ddf s390: critical section cleanup vs. machine checks
    6bf083f perf,x86: fix link failure for non-Intel configs
    d780563 perf,x86: fix wrmsr_on_cpu() warning on suspend/resume
    8c97feb selinux: use GFP_ATOMIC under spin_lock
    e550050 powerpc: Fix cputable entry for 970MP rev 1.0
    9d4a6f2 powerpc: Fix STAB initialization
    32f8134 w1: fix oops when w1_search is called from netlink connector
    dce5c33 hwmon: (lineage-pem) Add missing terminating entry for pem_[input|fan]_attributes
    fa55537 hwmon: (pmbus/ltc2978) Fix temperature reporting
    fe88b8b ALSA: seq: Fix missing error handling in snd_seq_timer_open()
    9a9b01c perf,x86: fix kernel crash with PEBS/BTS after suspend/resume
    75750fc TTY: do not reset master's packet mode
    3b11e57 tty: serial: fix typo "ARCH_S5P6450"
    d91371b serial: 8250_pci: add support for another kind of NetMos Technology PCI 9835 Multi-I/O Controller
    e3c51d6 ext3: Fix format string issues
    44ddae4 signal: always clear sa_restorer on execve
    a4371b6 staging: vt6656: Fix oops on resume from suspend.
    0319f99 USB: EHCI: don't check DMA values in QH overlays
    0b520a5 USB: storage: fix Huawei mode switching regression
    e870d9d usb: serial: Add Rigblaster Advantage to device table
    5c1892e USB: added support for Cinterion's products AH6 and PLS8
    0864bc5 usb: cp210x new Vendor/Device IDs
    5c6142c USB: cdc-wdm: fix buffer overflow
    82eccc2 USB: option: add Huawei E5331
    c8fba58 virtio: rng: disallow multiple device registrations, fixes crashes
    40e0c1e xen/pciback: Don't disable a PCI device that is already disabled.
    9909423 qcaux: add Franklin U600
    92a7adf Linux 3.4.36
    8420d82 USB: Fix connected device switch to Inactive state.
    983c9b4 Revert "ALSA: hda - hdmi: Make jacks phantom, if they're not detectable"
    beabe20 USB: Rip out recursive call on warm port reset.
    e850004 USB: Prepare for refactoring by adding extra udev checks.
    ac79dc9 USB: Don't use EHCI port sempahore for USB 3.0 hubs.
    d2c96b7 dmi_scan: fix missing check for _DMI_ signature in smbios_present()
    abf73cb ftrace: Update the kconfig for DYNAMIC_FTRACE
    f39e4f1 Fix memory leak in cpufreq stats.
    cc6de71 vfs: fix pipe counter breakage
    3126603 Fix: compat_rw_copy_check_uvector() misuse in aio, readv, writev, and security keys
    96ace77 keys: fix race with concurrent install_user_keyrings()
    30e39b7 crypto: user - fix info leaks in report API
    76de736 xen/pat: Disable PAT using pat_enabled value.
    626614b HID: logitech-dj: do not directly call hid_output_raw_report() during probe
    1c48233 e1000e: fix pci-device enable-counter balance
    f4ec9b2 ALSA: vmaster: Fix slave change notification
    1515f18 ALSA: ice1712: Initialize card->private_data properly
    724285c ARM: 7663/1: perf: fix ARMv7 EVTYPE_MASK to include NSH bit
    b08994d drm/radeon: add primary dac adj quirk for R200 board
    bc37694 hwmon: (pmbus/ltc2978) Use detected chip ID to select supported functionality
    ec2bc2f hwmon: (pmbus/ltc2978) Fix peak attribute handling
    cca30bd hwmon: (sht15) Check return value of regulator_enable()
    fbad807 md: raid0: fix error return from create_stripe_zones.
    c443082 md: fix two bugs when attempting to resize RAID0 array.
    517557f md: protect against crash upon fsync on ro array
    f9c89da ath9k_hw: improve reset reliability after errors
    34127f3 ath9k: fix RSSI dummy marker value
    97cf710 mwifiex: correct sleep delay counter
    681e3b1 hw_random: make buffer usable in scatterlist.
    7ae6c92 ata_piix: reenable MS Virtual PC guests
    1ecb693 SUNRPC: Don't start the retransmission timer when out of socket space
    d3e8a18 NFS: Don't allow NFS silly-renamed files to be deleted, no signal
    18d2c79 cifs: ensure that cifs_get_root() only traverses directories
    d0e44ed btrfs: Init io_lock after cloning btrfs device struct
    a564641 target/pscsi: Fix page increment
    c60de93 SCSI: storvsc: Initialize the sglist
    7628421 SCSI: dc395x: uninitialized variable in device_alloc()
    f8ac697 xen/pci: We don't do multiple MSI's.
    b9dfac7 ARM: fix scheduling while atomic warning in alignment handling code
    65723919 ARM: VFP: fix emulation of second VFP instruction

    Bug: 8531623
    Change-Id: I33e46f02e12deb6ab9f963392bec77aca8a5d66a

commit f2ef6030adc07ecfcc3bb545b2876cc99fe73fe7
Merge: eba84c1 f393929
Author: Martijn Coenen <maco@google.com>
Date:   Sun Apr 7 13:08:17 2013 -0700

    am f3939299: am 0bceb2dd: Manta: NFC: Set delays for power on and reset.

    * commit 'f3939299f4fcdae46262dde84d1e2986f0f7119a':
      Manta: NFC: Set delays for power on and reset.

commit f3939299f4fcdae46262dde84d1e2986f0f7119a
Merge: 9e4c16b 0bceb2d
Author: Martijn Coenen <maco@google.com>
Date:   Sun Apr 7 13:04:55 2013 -0700

    am 0bceb2dd: Manta: NFC: Set delays for power on and reset.

    * commit '0bceb2dd42ab40a89796c311e1d2d8792bfcff95':
      Manta: NFC: Set delays for power on and reset.

commit 0bceb2dd42ab40a89796c311e1d2d8792bfcff95
Author: Martijn Coenen <maco@google.com>
Date:   Sun Apr 7 12:55:02 2013 -0700

    Manta: NFC: Set delays for power on and reset.

    Change-Id: Ib1b8e7c711469e3a9dc46b66a6151820a8d4e36f

commit eba84c1f161514a09245b17a3ea47e61608e220e
Merge: 5797b15 9e4c16b
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Apr 4 12:58:30 2013 -0700

    am 9e4c16b5: am a560a084: Merge "auto-generated blob list" into jb-mr2-dev

    * commit '9e4c16b596e96779757ba7d20bcb818ca9106a5a':
      auto-generated blob list

commit 9e4c16b596e96779757ba7d20bcb818ca9106a5a
Merge: 3605670 a560a08
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Apr 4 12:56:23 2013 -0700

    am a560a084: Merge "auto-generated blob list" into jb-mr2-dev

    * commit 'a560a084da78fe00b106dde14c441be843cbfdfa':
      auto-generated blob list

commit a560a084da78fe00b106dde14c441be843cbfdfa
Merge: 3948fda 5602f59
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Apr 4 19:53:43 2013 +0000

    Merge "auto-generated blob list" into jb-mr2-dev

commit 5602f59ee3e5b5cf2ed35d2bff67d650bc964998
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Apr 4 12:29:22 2013 -0700

    auto-generated blob list

    Bug: 4295425
    Change-Id: Ie3e5af4f0685f0a7b090204c3729a00850c5b1c6

commit 5797b1529e6e94d51e26ad98201dd6f81907c98c
Merge: 653d42c 3605670
Author: Eric Laurent <elaurent@google.com>
Date:   Thu Apr 4 10:10:26 2013 -0700

    am 3605670a: am 3948fda1: audio: implement mute on hdmi multichannel

    * commit '3605670aa524b6095bf42811d81b361d5d354409':
      audio: implement mute on hdmi multichannel

commit 3605670aa524b6095bf42811d81b361d5d354409
Merge: 6683625 3948fda
Author: Eric Laurent <elaurent@google.com>
Date:   Thu Apr 4 10:06:48 2013 -0700

    am 3948fda1: audio: implement mute on hdmi multichannel

    * commit '3948fda1045dc265eaae0eff7595e63418738d29':
      audio: implement mute on hdmi multichannel

commit 3948fda1045dc265eaae0eff7595e63418738d29
Author: Eric Laurent <elaurent@google.com>
Date:   Thu Apr 4 09:24:22 2013 -0700

    audio: implement mute on hdmi multichannel

    On direct output streams the audio HAL must implement
    the volume function. In the case of HDMI the only function
    required is to mute audio when volume is 0 as volume
    is defined as fixed on digital output streams.

    Bug 8541062

    Change-Id: I24c24b4807ed06b41b1172189162531d5335bb3e

commit 653d42ca599fe70c25562724f1b1afacd45572e0
Merge: 4930bc3 6683625
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Apr 3 18:05:24 2013 -0700

    am 66836258: Reconcile with jb-mr2-release - do not merge

    * commit '668362589f44aad49d8fda7feb6ac62569358569':

commit 668362589f44aad49d8fda7feb6ac62569358569
Merge: add5753 82a6363
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Apr 3 16:43:13 2013 -0700

    Reconcile with jb-mr2-release - do not merge

    Change-Id: Id9607ee537e2c0731cc5e6e4b886b0033a2a1aaf

commit 82a6363d2ee349f3f434534fdd36addea0d9088e
Merge: efbf21f 335f80c
Author: The Android Automerger <android-build@android.com>
Date:   Wed Apr 3 06:02:03 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 4930bc38664cc17f67105d3c6f6013c3ef2786ec
Merge: 23700c6 add5753
Author: Erik Gilling <konkers@android.com>
Date:   Tue Apr 2 16:45:21 2013 -0700

    am add57531: am efbf21f4: new kernel prebuilt

    * commit 'add57531c20734d178220ba3f811cdb3afbb2744':
      new kernel prebuilt

commit add57531c20734d178220ba3f811cdb3afbb2744
Merge: cf08560 efbf21f
Author: Erik Gilling <konkers@android.com>
Date:   Tue Apr 2 16:40:49 2013 -0700

    am efbf21f4: new kernel prebuilt

    * commit 'efbf21f4f5c6a4d4ba7f5eab49400db8f7dc571d':
      new kernel prebuilt

commit efbf21f4f5c6a4d4ba7f5eab49400db8f7dc571d
Author: Erik Gilling <konkers@android.com>
Date:   Tue Apr 2 14:29:56 2013 -0700

    new kernel prebuilt

    includes:
    8808959 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    3856b5a mali: ARM Mali driver kernel trunk sync [revision 81791 (Daikon)]

    Change-Id: I51ca9bd812794d7e1a9e3f1fa575982f9818e877
    Signed-off-by: Erik Gilling <konkers@android.com>

commit 23700c69ecd4449826d4c5cd60106cf9e8a92db9
Merge: 118a8ac cf08560
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Tue Apr 2 11:04:27 2013 -0700

    am cf085603: am 370defa4: manta: update kernel prebuilt

    * commit 'cf0856031a50c7b58544dc87b5749be989bfa10a':
      manta: update kernel prebuilt

commit 118a8ac6cad683bd5376cc31f2c2a171c86c2ff5
Merge: a16063b 2cae801
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Tue Apr 2 11:04:03 2013 -0700

    am 2cae8014: am f654b082: manta: wifi: Use another universal locale with better A-band support

    * commit '2cae8014feaf42a73c0c54d3a7eae29fe47cc093':
      manta: wifi: Use another universal locale with better A-band support

commit cf0856031a50c7b58544dc87b5749be989bfa10a
Merge: 2cae801 370defa
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Tue Apr 2 09:53:37 2013 -0700

    am 370defa4: manta: update kernel prebuilt

    * commit '370defa4320637e33d5a9742f335f71133540e6f':
      manta: update kernel prebuilt

commit 335f80cfcfd1216513fc41e1cc04b5f783d8a322
Merge: f654b08 254eedf
Author: The Android Automerger <android-build@android.com>
Date:   Tue Apr 2 09:18:09 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 2cae8014feaf42a73c0c54d3a7eae29fe47cc093
Merge: 8c05999 f654b08
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Tue Apr 2 08:24:00 2013 -0700

    am f654b082: manta: wifi: Use another universal locale with better A-band support

    * commit 'f654b082d30391218c985cd2e2c9089e1b444e11':
      manta: wifi: Use another universal locale with better A-band support

commit 370defa4320637e33d5a9742f335f71133540e6f
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Mon Apr 1 18:11:54 2013 -0700

    manta: update kernel prebuilt

    f357ed9 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    06736e8 Merge branch 'android-3.4' into android-exynos-3.4
    7497632 net: wireless: bcmdhd: Update to version 1.88.7
    d584619 ARM: exynos: manta: Adjust wlan locale for FW 6.10.177.13
    c3fd6e7 media: exynos-tv: added audio switch to HDMI HPD

    Bug: 8338331

    Change-Id: I89cc994b13e30c76c8bcc83dd887b999ba012b14
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit a16063be84a922979ceb2eaffbddfdcb8da5a221
Merge: 0eb55b7 8c05999
Author: Geremy Condra <gcondra@google.com>
Date:   Mon Apr 1 14:42:43 2013 -0700

    am 8c059991: am ec1dff42: Merge "Give adbd search permission for ffs."

    * commit '8c05999192e6b347a8cdee92b1f8b7e1f71a7f5c':
      Give adbd search permission for ffs.

commit 8c05999192e6b347a8cdee92b1f8b7e1f71a7f5c
Merge: cd10751 ec1dff4
Author: Geremy Condra <gcondra@google.com>
Date:   Mon Apr 1 14:40:56 2013 -0700

    am ec1dff42: Merge "Give adbd search permission for ffs."

    * commit 'ec1dff42bbe95c07a009e3beec68958f38043f8c':
      Give adbd search permission for ffs.

commit f654b082d30391218c985cd2e2c9089e1b444e11
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Mon Apr 1 14:40:31 2013 -0700

    manta: wifi: Use another universal locale with better A-band support

    Bug: 8315336

    Change-Id: Iff2f2965b662a3e4b7c627bc53ab74287bec47d4
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit ec1dff42bbe95c07a009e3beec68958f38043f8c
Merge: 30bd97d 4336ad2
Author: Geremy Condra <gcondra@google.com>
Date:   Mon Apr 1 20:34:14 2013 +0000

    Merge "Give adbd search permission for ffs."

commit 0eb55b78e24d043c6b511a533990b2ad02a80f57
Merge: 757136b cd10751
Author: Geremy Condra <gcondra@google.com>
Date:   Mon Apr 1 11:27:44 2013 -0700

    am cd107513: am 30bd97d7: Merge "Label the .gps.interface.pipe.to_jni pipe with gps_data_file."

    * commit 'cd107513b24169cf64c57d04e0bf21404cbbe537':
      Label the .gps.interface.pipe.to_jni pipe with gps_data_file.

commit cd107513b24169cf64c57d04e0bf21404cbbe537
Merge: 4492241 30bd97d
Author: Geremy Condra <gcondra@google.com>
Date:   Mon Apr 1 11:25:34 2013 -0700

    am 30bd97d7: Merge "Label the .gps.interface.pipe.to_jni pipe with gps_data_file."

    * commit '30bd97d76ea13015899a5ed6288fc03d50c720ce':
      Label the .gps.interface.pipe.to_jni pipe with gps_data_file.

commit 30bd97d76ea13015899a5ed6288fc03d50c720ce
Merge: b2ab4b8 679b652
Author: Geremy Condra <gcondra@google.com>
Date:   Mon Apr 1 18:01:16 2013 +0000

    Merge "Label the .gps.interface.pipe.to_jni pipe with gps_data_file."

commit 4336ad26edd0c0eff7907a559a0d0e35c307e5d4
Author: Robert Craig <rpcraig@tycho.ncsc.mil>
Date:   Tue Jan 15 08:39:06 2013 -0500

    Give adbd search permission for ffs.

    Change-Id: I24f0a6ef9a4c1af15b2bf561c75975f24c635b6b
    Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

commit 679b652c13a26fe543ca028c08190f6eeff0979d
Author: Stephen Smalley <sds@tycho.nsa.gov>
Date:   Mon Apr 1 10:11:57 2013 -0400

    Label the .gps.interface.pipe.to_jni pipe with gps_data_file.

    Defines a name-based type transition for the named pipe.
    Depends on I046fa9f7122f77506c70b2c735345bc0194935df

    Change-Id: I5adee36b9309743d97c567df5f1e40ea76f34376
    Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>

commit 757136b9c8bee0f3715570fdf7f16516d31654b4
Merge: 1a8847e 4492241
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Mar 29 09:54:36 2013 -0700

    am 44922415: (-s ours) Reconcile with jb-mr2-release - do not merge

    * commit '4492241573551a8c855072d378e95d0d71ae9581':

commit 4492241573551a8c855072d378e95d0d71ae9581
Merge: 143d65d 254eedf
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Mar 29 09:48:46 2013 -0700

    Reconcile with jb-mr2-release - do not merge

    Change-Id: I0289831f227ed7feef066c286e5f2ecf5be35a03

commit 254eedfa35c9288886813618236ca08a2a0c8c26
Merge: 5785485 ee96fd7
Author: The Android Automerger <android-build@android.com>
Date:   Thu Mar 28 05:55:11 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 1a8847ecbdd014ec69d9e38b9bbca4a5f5b304d9
Merge: 56a0608 143d65d
Author: Martijn Coenen <maco@google.com>
Date:   Wed Mar 27 16:40:47 2013 -0700

    am 143d65dd: am 57854854: Merge "Manta: NFC: Re-enable UICC idle timeout feature." into jb-mr2-dev

    * commit '143d65dd629b949594df371f92efa1918bdb51bc':
      Manta: NFC: Re-enable UICC idle timeout feature.

commit 143d65dd629b949594df371f92efa1918bdb51bc
Merge: 316f294 5785485
Author: Martijn Coenen <maco@google.com>
Date:   Wed Mar 27 16:37:26 2013 -0700

    am 57854854: Merge "Manta: NFC: Re-enable UICC idle timeout feature." into jb-mr2-dev

    * commit '578548544ad09cf562150e8e5340405872735ec5':
      Manta: NFC: Re-enable UICC idle timeout feature.

commit 578548544ad09cf562150e8e5340405872735ec5
Merge: f81ccfe c11ac44
Author: Martijn Coenen <maco@google.com>
Date:   Wed Mar 27 23:34:55 2013 +0000

    Merge "Manta: NFC: Re-enable UICC idle timeout feature." into jb-mr2-dev

commit c11ac4438329c7d890e9e467819393b8bd005015
Author: Martijn Coenen <maco@google.com>
Date:   Wed Mar 27 16:32:34 2013 -0700

    Manta: NFC: Re-enable UICC idle timeout feature.

    New stack drop has fix for NFCC not powering up for
    HCI commands. Should fix the issues we were seeing
    with UICC idle in duration testing.

    Bug: 8048494
    Change-Id: I9262f9282117449afdf7ea93d710e826b9f26c43

commit 56a06089eeb2aad4c73788058ac0cdd6198485c1
Merge: 4ba394a 316f294
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Wed Mar 27 14:11:49 2013 -0700

    am 316f294b: am f81ccfe7: manta: wifi: Disable spuravoid feature in FW

    * commit '316f294b82a4db33f07ba4ae6cfaacf699124664':
      manta: wifi: Disable spuravoid feature in FW

commit 316f294b82a4db33f07ba4ae6cfaacf699124664
Merge: 2ade23b f81ccfe
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Wed Mar 27 14:09:58 2013 -0700

    am f81ccfe7: manta: wifi: Disable spuravoid feature in FW

    * commit 'f81ccfe7345bef29632f848e817ff8b53ddd3f2c':
      manta: wifi: Disable spuravoid feature in FW

commit f81ccfe7345bef29632f848e817ff8b53ddd3f2c
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Wed Mar 27 13:49:12 2013 -0700

    manta: wifi: Disable spuravoid feature in FW

    Change-Id: I52f3cc678c5f4d886e1807634e9f39181368f7b2
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit ee96fd7b45c9d42eb28f73ae0a06ed98c621f944
Merge: b9d27dd 9776462
Author: The Android Automerger <android-build@android.com>
Date:   Wed Mar 27 05:55:15 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 4ba394a3f5633ca1146ada17a325f053085363bb
Merge: 8678a91 2ade23b
Author: Erik Gilling <konkers@android.com>
Date:   Tue Mar 26 14:40:48 2013 -0700

    am 2ade23b5: am b9d27dd5: new kernel prebuilt

    * commit '2ade23b5b2c869ef8e1d94c86e15815669337903':
      new kernel prebuilt

commit 2ade23b5b2c869ef8e1d94c86e15815669337903
Merge: b279546 b9d27dd
Author: Erik Gilling <konkers@android.com>
Date:   Tue Mar 26 14:39:29 2013 -0700

    am b9d27dd5: new kernel prebuilt

    * commit 'b9d27dd5c6254ee8b10949d827270cb1ac63d426':
      new kernel prebuilt

commit b9d27dd5c6254ee8b10949d827270cb1ac63d426
Author: Erik Gilling <konkers@android.com>
Date:   Tue Mar 26 14:33:36 2013 -0700

    new kernel prebuilt

    includes:
    10ccabf Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    b4ff7c6 mali: ARM Mali driver kernel trunk sync [revision 81124 (Cabbage)]
    9ba3aa4 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    3b008f1 Merge branch 'android-3.4' into android-exynos-3.4
    2243fa8 net: wireless: bcmdhd: Update to version 1.88.6
    04b3bb9 Merge branch 'android-3.4' into android-exynos-3.4
    c4483b5 cpufreq: interactive: base above_hispeed_delay on target freq, not current
    e28fa08 ARM: exynos: manta: enable CONFIG_MALI_T6XX_DEBUG_SYS in defconfig
    41f4818 ARM: add config option to build zImage/dtb combo
    4bc66bf net: wireless: bcmdhd: Update to version 1.88.4
    2830489 ARM: exynos: manta: add pdata to limit i2s channels
    6193366 ASoC: wm8994: Support constraining the maximum number of channels clocked
    44c7a1f Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    19a3265 Merge branch 'android-3.4' into android-exynos-3.4
    cad1684 cpufreq: interactive: fix crash on error paths in get_tokenized_data

    Change-Id: If1f9c0e955111d819b6776d22e50a535c634257c
    Signed-off-by: Erik Gilling <konkers@android.com>

commit 8678a91796c6ce8899bb01f774aad164db0c819c
Merge: 953962b b279546
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Mar 26 14:18:36 2013 -0700

    am b2795465: am 49737d1b: Rename AOSP builds to aosp_*

    * commit 'b279546561c9a8c7c721ac0a5e9188ad6633ea30':
      Rename AOSP builds to aosp_*

commit b279546561c9a8c7c721ac0a5e9188ad6633ea30
Merge: 866c6e2 49737d1
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Mar 26 14:13:09 2013 -0700

    am 49737d1b: Rename AOSP builds to aosp_*

    * commit '49737d1b4a66c05e7e4c5b9325b029223b3c5224':
      Rename AOSP builds to aosp_*

commit 953962b1f3e6e035217f1d297c03bb3ff703c57c
Merge: 76c6d43 866c6e2
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Mar 26 12:17:41 2013 -0700

    am 866c6e22: (-s ours) Reconcile with jb-mr2-release - do not merge

    * commit '866c6e2273dee34501e195645fd7c361637bfb13':

commit 866c6e2273dee34501e195645fd7c361637bfb13
Merge: c661123 9776462
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Mar 26 10:49:13 2013 -0700

    Reconcile with jb-mr2-release - do not merge

    Change-Id: Ic2d57445893c65eaf8332fb48abe9723b3fefccc

commit 49737d1b4a66c05e7e4c5b9325b029223b3c5224
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Mar 22 15:53:57 2013 -0700

    Rename AOSP builds to aosp_*

    Change-Id: I25589f2282f6757dc17ba9fbd577ce83eb60cd31

commit 9776462b8cf23699072848b67026757ee408bd28
Merge: 1f7068e dd24c27
Author: The Android Automerger <android-build@android.com>
Date:   Tue Mar 26 05:55:08 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 76c6d431aaf5fb95c4964f5b0f5fe33f8774bf80
Merge: 4545a26 c661123
Author: Todd Poynor <toddpoynor@google.com>
Date:   Mon Mar 25 22:58:37 2013 +0000

    am c6611237: am 1f7068e3: manta: treat iowait as busy for cpufreq interactive governor

    * commit 'c6611237b28785542fe5516e1b2df086de017cd6':
      manta: treat iowait as busy for cpufreq interactive governor

commit c6611237b28785542fe5516e1b2df086de017cd6
Merge: 20ea5e7 1f7068e
Author: Todd Poynor <toddpoynor@google.com>
Date:   Mon Mar 25 22:55:57 2013 +0000

    am 1f7068e3: manta: treat iowait as busy for cpufreq interactive governor

    * commit '1f7068e3fefeaed7b998ad9a35c63404bb2c11fb':
      manta: treat iowait as busy for cpufreq interactive governor

commit 1f7068e3fefeaed7b998ad9a35c63404bb2c11fb
Author: Todd Poynor <toddpoynor@google.com>
Date:   Mon Mar 25 13:19:20 2013 -0700

    manta: treat iowait as busy for cpufreq interactive governor

    Prevent regression in storage benchmarks.

    Bug: 8460661
    Change-Id: I347f9561d935d0a5e6b8110393c3e2d7e243619d

commit dd24c27b5341703ce311f7a1c58ef4b383bdf235
Merge: fd6664e d710e86
Author: The Android Automerger <android-build@android.com>
Date:   Mon Mar 25 05:55:18 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 4545a265d09174759feb937978756dcff78f3fc6
Merge: 8958602 20ea5e7
Author: Elliott Hughes <enh@google.com>
Date:   Sat Mar 23 00:46:20 2013 +0000

    am 20ea5e78: am fd6664ea: am 5db0e029: am b2ab4b85: Merge "Remove unused samsung/manta ARCH_ARM_HAVE_TLS_REGISTER."

    * commit '20ea5e78bb79aa7dbd952f4b58489c4f163d9258':
      Remove unused samsung/manta ARCH_ARM_HAVE_TLS_REGISTER.

commit 20ea5e78bb79aa7dbd952f4b58489c4f163d9258
Merge: 2b8f8dd fd6664e
Author: Elliott Hughes <enh@google.com>
Date:   Sat Mar 23 00:44:28 2013 +0000

    am fd6664ea: am 5db0e029: am b2ab4b85: Merge "Remove unused samsung/manta ARCH_ARM_HAVE_TLS_REGISTER."

    * commit 'fd6664ea94c35494ad4941be88d4ab4ffdb99e5d':
      Remove unused samsung/manta ARCH_ARM_HAVE_TLS_REGISTER.

commit fd6664ea94c35494ad4941be88d4ab4ffdb99e5d
Merge: b505295 5db0e02
Author: Elliott Hughes <enh@google.com>
Date:   Fri Mar 22 17:40:03 2013 -0700

    am 5db0e029: am b2ab4b85: Merge "Remove unused samsung/manta ARCH_ARM_HAVE_TLS_REGISTER."

    * commit '5db0e0291ab7fade69b25341a277a895235e657a':
      Remove unused samsung/manta ARCH_ARM_HAVE_TLS_REGISTER.

commit 5db0e0291ab7fade69b25341a277a895235e657a
Merge: 0a28495 b2ab4b8
Author: Elliott Hughes <enh@google.com>
Date:   Fri Mar 22 17:38:22 2013 -0700

    am b2ab4b85: Merge "Remove unused samsung/manta ARCH_ARM_HAVE_TLS_REGISTER."

    * commit 'b2ab4b8568fc163e454884934badbc6befde866a':
      Remove unused samsung/manta ARCH_ARM_HAVE_TLS_REGISTER.

commit b2ab4b8568fc163e454884934badbc6befde866a
Merge: 0d12b8f 4855484
Author: Elliott Hughes <enh@google.com>
Date:   Fri Mar 22 23:44:27 2013 +0000

    Merge "Remove unused samsung/manta ARCH_ARM_HAVE_TLS_REGISTER."

commit 8958602b855d59b6cb26dcd3a683ed18db8c2b5e
Merge: a0561dd 2b8f8dd
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Fri Mar 22 23:04:32 2013 +0000

    am 2b8f8ddf: am b5052953: manta: wifi: Remove obsolete path to P2P FW

    * commit '2b8f8ddfa18fd67e9dfeb98e80d0b14a5447cd80':
      manta: wifi: Remove obsolete path to P2P FW

commit 2b8f8ddfa18fd67e9dfeb98e80d0b14a5447cd80
Merge: 8e3f8da b505295
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Fri Mar 22 23:01:37 2013 +0000

    am b5052953: manta: wifi: Remove obsolete path to P2P FW

    * commit 'b5052953bd7d4d87b3b54575d356c6bf006fb641':
      manta: wifi: Remove obsolete path to P2P FW

commit b5052953bd7d4d87b3b54575d356c6bf006fb641
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Fri Mar 22 15:23:49 2013 -0700

    manta: wifi: Remove obsolete path to P2P FW

    Change-Id: Ic776484f988a58861c50644b543c926313a684e2
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit 48554843b2c567188ace6ede5d50c816c2d342ec
Author: Elliott Hughes <enh@google.com>
Date:   Thu Mar 21 18:58:48 2013 -0700

    Remove unused samsung/manta ARCH_ARM_HAVE_TLS_REGISTER.

    Change-Id: Ifab1fdee6509c783d8f9678c521505532e0522e6

commit a0561dd34724e667b138fd3b42cd004b04b2bc01
Merge: ad55230 8e3f8da
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Mar 20 16:42:01 2013 +0000

    am 8e3f8daa: (-s ours) Reconcile with jb-mr2-release - do not merge

    * commit '8e3f8daabb5974f4d866b12f9cc3c99053f8ba04':
      Revert "Manta: NFC: Enable UICC_IDLE timeout feature."

commit 8e3f8daabb5974f4d866b12f9cc3c99053f8ba04
Merge: dfa60f1 d710e86
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Mar 20 09:32:23 2013 -0700

    Reconcile with jb-mr2-release - do not merge

    Change-Id: I8bbac87277eb26ab85af8a6641c383e0cc89446b

commit d710e86d539efae560d33db588860315f98dfbd9
Merge: dfa60f1 e91f66a
Author: The Android Automerger <android-build@android.com>
Date:   Wed Mar 20 05:55:09 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit ad55230026b66d6e99d8fc9e37627e993606ceef
Merge: e0edde4 dfa60f1
Author: Todd Poynor <toddpoynor@google.com>
Date:   Tue Mar 19 23:19:41 2013 +0000

    am dfa60f1c: manta: prebuilt kernel (interactive governor iowait etc., tracing options)

    * commit 'dfa60f1c1a0fe53702ff1fcc30c5ff4dfa91b6b2':
      manta: prebuilt kernel (interactive governor iowait etc., tracing options)

commit dfa60f1c1a0fe53702ff1fcc30c5ff4dfa91b6b2
Author: Todd Poynor <toddpoynor@google.com>
Date:   Tue Mar 19 16:11:13 2013 -0700

    manta: prebuilt kernel (interactive governor iowait etc., tracing options)

    5ddcd0d Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    bd6ea1e Merge branch 'android-3.4' into android-exynos-3.4
    fbcad72 cpufreq: interactive: add io_is_busy interface
    e43dde3 cpufreq: interactive: allow arbitrary speed / delay mappings
    fe9919e ARM: exynos: manta: disable SCHED_TRACER, enable DEFAULT_TRACERS

    Change-Id: Ic47442cf53e9e618a87a9fb41a157ea184fd14f7

commit e0edde427037a804d0cb36b8f5bba2f826ec7a77
Merge: fb86952 36463e5
Author: Geremy Condra <gcondra@google.com>
Date:   Tue Mar 19 22:46:32 2013 +0000

    am 36463e5c: am 0a284958: am 0d12b8f0: Merge "Initial security policy."

    * commit '36463e5cc23e18d470e22d1cc7ab60275430fb60':
      Initial security policy.

commit 36463e5cc23e18d470e22d1cc7ab60275430fb60
Merge: eb82cff 0a28495
Author: Geremy Condra <gcondra@google.com>
Date:   Tue Mar 19 15:43:54 2013 -0700

    am 0a284958: am 0d12b8f0: Merge "Initial security policy."

    * commit '0a284958916cda4907a7e7478d6204733093d587':
      Initial security policy.

commit 0a284958916cda4907a7e7478d6204733093d587
Merge: 55c6dbb 0d12b8f
Author: Geremy Condra <gcondra@google.com>
Date:   Tue Mar 19 15:41:30 2013 -0700

    am 0d12b8f0: Merge "Initial security policy."

    * commit '0d12b8f0379f2a98002b9c6a4050e764ffebbe95':
      Initial security policy.

commit 0d12b8f0379f2a98002b9c6a4050e764ffebbe95
Merge: 295bc78 e3a6981
Author: Geremy Condra <gcondra@google.com>
Date:   Tue Mar 19 22:23:12 2013 +0000

    Merge "Initial security policy."

commit fb86952c3228e5d0e335607352f9bfecd6e2eabb
Merge: 4d79fc4 eb82cff
Author: Romain Guy <romainguy@google.com>
Date:   Tue Mar 19 19:01:07 2013 +0000

    am eb82cff5: Merge "Rename texture cache flush rate property" into jb-mr2-dev

    * commit 'eb82cff5eac7b2315366646683d0965057e4d060':
      Rename texture cache flush rate property

commit eb82cff5eac7b2315366646683d0965057e4d060
Merge: 09c3fa1 1e9d695
Author: Romain Guy <romainguy@google.com>
Date:   Tue Mar 19 18:57:52 2013 +0000

    Merge "Rename texture cache flush rate property" into jb-mr2-dev

commit 1e9d6952e5b6605416f09d1ce25ef76f49bc2ead
Author: Romain Guy <romainguy@google.com>
Date:   Tue Mar 19 11:56:52 2013 -0700

    Rename texture cache flush rate property

    Change-Id: I570d28ee25c0372da76ea4e1d2a9d4028f9e06ca

commit 4d79fc4bcff22789e541ae190ace4892a8cf5d88
Merge: cc3290f 09c3fa1
Author: Romain Guy <romainguy@google.com>
Date:   Tue Mar 19 18:07:37 2013 +0000

    am 09c3fa14: Merge "Update cache sizes for the new unified path cache" into jb-mr2-dev

    * commit '09c3fa14e4edfbe07f21cc348a61f3cff91433a1':
      Update cache sizes for the new unified path cache

commit 09c3fa14e4edfbe07f21cc348a61f3cff91433a1
Merge: 58b4ca0 74c9380
Author: Romain Guy <romainguy@google.com>
Date:   Tue Mar 19 18:05:01 2013 +0000

    Merge "Update cache sizes for the new unified path cache" into jb-mr2-dev

commit 74c9380550c2864ffba64d4e7a11c775757cdd33
Author: Romain Guy <romainguy@google.com>
Date:   Tue Mar 19 11:03:38 2013 -0700

    Update cache sizes for the new unified path cache

    Change-Id: I03d8a4f8c651a3ec69b794d8c1e7b3f15847af40

commit e91f66a4cb7aeb231795df505cbcc0327cfa733d
Author: Martijn Coenen <maco@google.com>
Date:   Mon Mar 18 14:49:18 2013 -0700

    Revert "Manta: NFC: Enable UICC_IDLE timeout feature."

    This reverts commit 52cba5d41789583c4f9403f284d4b579d9da4798.

commit cc3290faa4a5020c28dbd1eed14d9f22ade1118b
Merge: 224ecba 58b4ca0
Author: Martijn Coenen <maco@google.com>
Date:   Mon Mar 18 22:09:03 2013 +0000

    am 58b4ca03: Revert "Manta: NFC: Enable UICC_IDLE timeout feature."

    * commit '58b4ca030313e3658d2acc22f80c8c72cb40547a':
      Revert "Manta: NFC: Enable UICC_IDLE timeout feature."

commit 58b4ca030313e3658d2acc22f80c8c72cb40547a
Author: Martijn Coenen <maco@google.com>
Date:   Mon Mar 18 14:49:18 2013 -0700

    Revert "Manta: NFC: Enable UICC_IDLE timeout feature."

    This reverts commit 52cba5d41789583c4f9403f284d4b579d9da4798.

commit 224ecba4246d9abc70901908da0ee468697adde4
Merge: 73d30dd 477d1c4
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Thu Mar 14 15:48:30 2013 +0000

    am 477d1c47: Merge "Use dumpstate directly for bugreports." into jb-mr2-dev

    * commit '477d1c47b6e14eca1a8eac15f3e9a91a6fc09362':
      Use dumpstate directly for bugreports.

commit 477d1c47b6e14eca1a8eac15f3e9a91a6fc09362
Merge: 7a733d2 313e670
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Thu Mar 14 15:44:30 2013 +0000

    Merge "Use dumpstate directly for bugreports." into jb-mr2-dev

commit 73d30dd38fd55d8921c6c27f44fb87c71a0e502f
Merge: 0e57946 7a733d2
Author: JP Abgrall <jpa@google.com>
Date:   Thu Mar 14 02:34:16 2013 +0000

    am 7a733d20: Merge "prebuilt kernel (3.4.5 to 3.4.35; strace fix; async ion_free)" into jb-mr2-dev

    * commit '7a733d20c485db71870ef9cba16ddaccdd51ab12':
      prebuilt kernel (3.4.5 to 3.4.35; strace fix; async ion_free)

commit 0e5794695571d139a811cb4c16713f869e128dc4
Merge: ab8c4be 3d19348
Author: Martijn Coenen <maco@google.com>
Date:   Thu Mar 14 02:34:16 2013 +0000

    am 3d193481: Merge "Manta: NFC: Enable UICC_IDLE timeout feature." into jb-mr2-dev

    * commit '3d193481b8230bc708ab5889e566281bda8a99a0':
      Manta: NFC: Enable UICC_IDLE timeout feature.

commit 313e670d69d71c5232fe4db9442eb727cc9e7cd0
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Wed Mar 13 17:10:18 2013 -0700

    Use dumpstate directly for bugreports.

    Use new broadcast flag on dumpstate to notify framework when a
    bugreport finished.  Remove older shell scripts.

    Bug: 7005318
    Change-Id: Iecdf5a37360204c1f803c028a0e49b7d1054a464

commit 7a733d20c485db71870ef9cba16ddaccdd51ab12
Merge: 3d19348 1b4fecf
Author: JP Abgrall <jpa@google.com>
Date:   Wed Mar 13 22:24:07 2013 +0000

    Merge "prebuilt kernel (3.4.5 to 3.4.35; strace fix; async ion_free)" into jb-mr2-dev

commit 3d193481b8230bc708ab5889e566281bda8a99a0
Merge: 97a19b6 52cba5d
Author: Martijn Coenen <maco@google.com>
Date:   Wed Mar 13 22:21:37 2013 +0000

    Merge "Manta: NFC: Enable UICC_IDLE timeout feature." into jb-mr2-dev

commit 52cba5d41789583c4f9403f284d4b579d9da4798
Author: Martijn Coenen <maco@google.com>
Date:   Wed Mar 13 15:20:53 2013 -0700

    Manta: NFC: Enable UICC_IDLE timeout feature.

    Bug: 7487151
    Change-Id: I4fc75c08972e7e4af71087e922ff16ae33b1f127

commit 1b4fecfa296414bd64d3af2abfc3516758af49f8
Author: JP Abgrall <jpa@google.com>
Date:   Tue Mar 12 19:12:50 2013 -0700

    prebuilt kernel (3.4.5 to 3.4.35; strace fix; async ion_free)

    d526dee Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    b670179 Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4
    211d866 CHROMIUM: arch/arm: Remove duplicated code in syscall_trace
    0e6c209 trace: add non-hierarchical function_graph option
    4e9ef39 gpu: ion: Make ion_free asynchronous
    152e04a trace: Add an option to show tgids in trace output
    0273611 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    2de556d dma: pl330: fix build after stable merge
    399ccb8 Merge branch 'android-3.4' into android-exynos-3.4
    342a047 Merge tag 'v3.4.35' into android-3.4
    74752ba Revert "ARM: vfp: Move exception address fixup into vfphw.S"
    2713e27 Linux 3.4.35
    ...
    9ab2f39 media: cx231xx: don't DMA to random addresses
    dfd45e8 Remove easily user-triggerable BUG from generic_setlease

    Change-Id: I43663029bab02d8e4be32f7ec2da6179a4ad76d8

commit ab8c4bedb7c4d5472b2da105cf55b0388dff651e
Merge: f7cbe5c 97a19b6
Author: Erik Gilling <konkers@android.com>
Date:   Mon Mar 11 23:44:03 2013 +0000

    am 97a19b67: Merge "new kernel prebuilt" into jb-mr2-dev

    * commit '97a19b672390853802388af8176e4cc30dccf022':
      new kernel prebuilt

commit 97a19b672390853802388af8176e4cc30dccf022
Merge: c66e68a b744e7c
Author: Erik Gilling <konkers@android.com>
Date:   Mon Mar 11 23:39:00 2013 +0000

    Merge "new kernel prebuilt" into jb-mr2-dev

commit b744e7c9767283cad23c503bf644ebb44a506a45
Author: Erik Gilling <konkers@android.com>
Date:   Mon Mar 11 16:24:27 2013 -0700

    new kernel prebuilt

    includes:
    3cd42ab Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    5de2174 mali: ARM Mali driver kernel trunk sync [revision 80008 (Beetroot)]

    Change-Id: I09002f77e8c25b941b2b13f08c89755c580bfefb
    Signed-off-by: Erik Gilling <konkers@android.com>

commit f7cbe5c5514072d5e63b50dce9437fcc5264bd38
Merge: f50d9f2 c66e68a
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 20:56:12 2013 +0000

    am c66e68a5: (-s ours) am 55c6dbb8: am aaa6f18b: am 5a0bb29c: am cfc09248: (-s ours) am 07f11e34: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'c66e68a52437e181f4467d078328e9b769d20995':

commit c66e68a52437e181f4467d078328e9b769d20995
Merge: f50d9f2 55c6dbb
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 13:44:31 2013 -0700

    am 55c6dbb8: am aaa6f18b: am 5a0bb29c: am cfc09248: (-s ours) am 07f11e34: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '55c6dbb839ca925581971acd4160cdf1d168dabc':

commit 55c6dbb839ca925581971acd4160cdf1d168dabc
Merge: 295bc78 aaa6f18
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 13:13:36 2013 -0700

    am aaa6f18b: am 5a0bb29c: am cfc09248: (-s ours) am 07f11e34: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'aaa6f18b62b0aca5d5ef174082a14999d30e7960':

commit aaa6f18b62b0aca5d5ef174082a14999d30e7960
Merge: eae5a87 5a0bb29
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 13:00:43 2013 -0700

    am 5a0bb29c: am cfc09248: (-s ours) am 07f11e34: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '5a0bb29cbc767530b940b1776d1363de8aeba1c3':

commit 5a0bb29cbc767530b940b1776d1363de8aeba1c3
Merge: 7f6968f cfc0924
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:41:49 2013 -0700

    am cfc09248: (-s ours) am 07f11e34: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'cfc09248d393baf1214d338a0b004a23869d3bee':

commit cfc09248d393baf1214d338a0b004a23869d3bee
Merge: 7f6968f 07f11e3
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:22:59 2013 -0700

    am 07f11e34: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '07f11e347481e30a8cf55945ae1761375488ea9e':

commit 07f11e347481e30a8cf55945ae1761375488ea9e
Merge: e3f8700 270fe99
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:15:58 2013 -0700

    Reconcile with jb-mr1-release - do not merge

commit f50d9f2f09faa1da07d7d54cb6fc45b597fefee9
Author: JP Abgrall <jpa@google.com>
Date:   Fri Mar 8 18:33:43 2013 -0800

    prebuilt kernel (nf LOG, SELinux enable, binder security hooks)

    150379b ARM: exynos: manta: enabled netfilter LOG target
    11ed33b Enable SELinux and its dependencies in the manta_defconfig.
    c086e15 Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    368e383 Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4
    a3c9991 Add security hooks to binder and implement the hooks for SELinux.

    Change-Id: Ic05e51c3b7aa5ee757247e816721ae9296a142d4

commit 3eba23ff9f6f95d7a62c3c92e062dd74347b218c
Merge: 79b7778 2b3a51b
Author: Martijn Coenen <maco@google.com>
Date:   Fri Mar 8 17:46:04 2013 +0000

    Merge "Manta: NFC: Enable NFC provisioning for EDU." into jb-mr2-dev

commit 79b777875347245e8b6c444dc12b29aa3dfc7616
Merge: bef56ee 295bc78
Author: Christopher Ferris <cferris@google.com>
Date:   Thu Mar 7 18:57:50 2013 -0800

    am 295bc785: Merge "Add TARGET_CPU_VARIANT := cortex-a15 for Manta."

    * commit '295bc7853eea860ca8d815ed3a2034298cab1f66':
      Add TARGET_CPU_VARIANT := cortex-a15 for Manta.

commit 295bc7853eea860ca8d815ed3a2034298cab1f66
Merge: 212946d 6b0fd41
Author: Christopher Ferris <cferris@google.com>
Date:   Fri Mar 8 02:11:31 2013 +0000

    Merge "Add TARGET_CPU_VARIANT := cortex-a15 for Manta."

commit 6b0fd415446a9542ba568e1551166de5f46b9f98
Author: Ben Cheng <bccheng@google.com>
Date:   Mon Jan 14 13:52:28 2013 -0800

    Add TARGET_CPU_VARIANT := cortex-a15 for Manta.

    -mcpu=cortex-a15 will be derived from it and passed to GCC.

    Bug: 7961327.

    Merge from internal master.

    Change-Id: I28db4028f0e7007dbcf5e43fc5fb9ea51bc97513

commit 2b3a51bfd2b1adf3fe83639aa6a6a449336291ce
Author: Martijn Coenen <maco@google.com>
Date:   Thu Mar 7 17:53:27 2013 -0800

    Manta: NFC: Enable NFC provisioning for EDU.

    Bug: 8275527
    Change-Id: I6a1fe8659253704cd03ace482af2668b8470e1f4

commit bef56eebd4adc3a8d8fc2c43df09787a22d4bae4
Author: JP Abgrall <jpa@google.com>
Date:   Wed Mar 6 19:06:18 2013 -0800

    prebuilt kernel (mmc sec erase, ipv6 def router, gpu trace event)

    6a6e5a6 Revert "mmc: manta: Treat secure erase like normal erase"
    ba73b42 Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    84407c8 Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4
    4487e21 net: ipv6: Don't purge default router if accept_ra=2
    8db2b27 input: misc: keychord: log when keychord triggered
    ddeb2bb trace/events: add gpu trace events

    Change-Id: I32045ef4c0deb8e818b83ed9162fd17a2b688449

commit 29a3aa8c364eb1c522cbadd05544d4327da0c154
Author: JP Abgrall <jpa@google.com>
Date:   Mon Mar 4 11:08:14 2013 -0800

    prebuilt kernel (serial irq leak, hiddev, wm8994 asoc merge)

    e9649b2 Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    deec2b9 Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4
    a042857 serial: samsung: fix leaked requested irq
    ab5e5a1 ARM: exynos: manta: Enable HIDDEV
    0fa57ab ASoC: wm8994: Defer declaration of open circuit microphones
    6105f75 ASoC: wm8994: Remove duplicate headset report
    15f4b4b ASoC: wm8994: Cancel delayed work for jackdet unconditionally
    389e0d0 ASoC: SAMSUNG: fix compilation issue
    ca03514 Merge remote-tracking branch 'asoc/v3.4-wm8994' into android-exynos-manta-3.4
    4592766 ASoC: wm8994: Allow microphone identification callback to be overridden
    089ab9a ASoC: wm8994: Check jack is inserted when handling mic IRQ
    b4b2535 ASoC: wm8994: Support custom accessory identification for WM1811A
    832780f ASoC: wm8994: Simplify button detection code
    4b3f3e7 mfd: wm8994: Add support for WM1811 rev E
    fd64290 ASoC: wm8994: Stop mic detection whenever we detect an open circuit
    1363c08 ASoC: wm8994: Lower AIFnCLK divisor when dropping to 32kHz
    939adf8 ASoC: wm8994: Only enable extra BCLK cycles when required
    cc7656b ASoC: wm8994: Allow a delay between jack insertion and microphone detect
    d5ecec3 ASoC: wm_hubs: Ensure volume updates are handled during class W startup
    2a33bbb ASoC: wm8994: Correct number of EQ registers
    adef53b ASoC: wm8994: Update for new WM1811 variants
    ae12cd3 mfd: wm8994: Implement support for WM1811 devices with higher cust_ids
    ca89676 mfd: wm8994: Update WM1811 register patches for latest evaluation
    04f4884 ASoC: wm_hubs: Add trace showing semantics of the DCS update
    d04f89a ASoC: wm_hubs: Use explicit casts for converting to signed
    ef5a336 ASoC: wm8994: Add bytes controls for DRC
    68808d2 ASoC: wm8994: Add missing dapm routes for WM8958 rev A
    03e8860 ASoC: wm8994: enable mic and short detect debounce.
    0f099aa ASoC: wm8994: Fix some indentation issues
    9f8ecac ASoC: wm_hubs: Rename calibrate_dc_servo()
    9457a33 ASoC: wm_hubs: Factor out DC servo readback code
    129242f ASoC: wm8994: Ensure we get a notification on startup for jackdet
    2bc28b7 ASoC: wm_hubs: Move CODEC stored in private data into wm_hubs
    b06b760 ASoC: wm8994: Hold runtime PM reference while handling mic and jack IRQs
    1f156c2 ASoC: wm8994: Implement support for self-oscillation mode in the FLL
    1624c10 ASoC: wm8994: Ensure there are enough BCLKs for four channels
    1ef47ad ASoC: dapm: Fix _PRE and _POST events for DAPM performance improvements
    905093e ASoC: wm8994: Apply volume updates with clocks enabled
    5b67ea89 ASoC: wm8994: Ensure all AIFnCLK events are run from the _late variants
    27cc38c ASoC: wm8994: Use regmap directly for wm8994_mic_work
    865f38a ASoC: wm8994: Add debounce to wm8994 mic detection
    81c5b1b ASoC: wm8994: Fix sparse warning due to use of 0 as NULL
    d3013e8 ASoC: wm_hubs: Cache multiple DCS offsets
    276ce08 ASoC: wm_hubs: Enable class W for output mixer paths
    59d9e56 ASoC: wm_hubs: Factor out class W management
    203c0f1 ASoC: wm_hubs: Special case headphones for digital paths in more use cases
    72cbcb3 ASoC: wm8994: Add trace showing wm8958_micd_set_rate()
    8939cf9 ASoC: wm8994: Allow rate configuration with custom mic callback
    2a45baf ASoC: wm8994: Tune debounce rates for jack detect mode
    165fdda ASoC: wm8994: Make sure we disable FLL bypass when stopping the FLL
    7463558 ASoC: wm8994: Delete trailing whitespace from sound/soc/codecs/wm8994.c
    c672f6c ASoC: wm8994: Keep AIF3 tristated when not in use
    7f3473e ASoC: wm8994: Implement FLL bypass support
    6a6d94f ASoC: wm8994: Don't test for NULL before release_firmware()
    b3f52e4 ASoC: wm8994: Don't bother updating the jackdet mode needlessly
    4e92e1b ASoC: wm8994: Don't bother lowering clock dividers inside idle AIFs
    556fa60 ASoC: wm8994: Don't allow reconfiguration of FLL when it provides SYSCLK
    2f32fb8 gpiolib: wm8994: Pay attention to the value set when enabling as output
    609c3eb gpiolib: wm8994: Convert to devm_kzalloc()
    4b9391a mfd: wm8994: Restore pin configuration after reset during suspend
    b9dfc89 mfd: wm8994: Support for user defined irq flags
    057fd96 mfd: Convert wm8994 to module_i2c_driver()
    b6423a5 mfd: Read CUST_ID from the wm8994 device
    63bc1f6 mfd: Cache wm8994 chip revision

    Change-Id: I3d5a485894a5b547cff78afa23945411a3baf380

commit 2a4b1b7adfdb1b36c98c330688c39ee913c53d16
Author: JP Abgrall <jpa@google.com>
Date:   Tue Feb 26 13:59:59 2013 -0800

    prebuilt kernel (heap reduction)

    a89dfb1 ARM: exynos: manta: reduce exynos contig heap to 2MB

    Change-Id: I7af6eb308b797902308bfd53b1e8bdb356fb35e4

commit 4244bab83d678d6ecdcf6f1acb5c8dc972dddbc4
Author: Rom Lemarchand <romlem@google.com>
Date:   Tue Feb 26 10:23:23 2013 -0800

    new kernel prebuilt

    includes:
    74a2825 Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    3900198 MFC: MEDIA: EXYNOS: Add support for EOS flag in FINISHING state
    d040240 media: v4l2: Add V4L2_BUF_FLAG_LAST_FRAME buffer flag

    Change-Id: I327b2cade4d3f0eae10656c4c9cfaa6d74db0a15
    Signed-off-by: Rom Lemarchand <romlem@google.com>

commit a10e7b3e7dd41003866f49de318119d9c444d5a9
Author: Erik Gilling <konkers@android.com>
Date:   Mon Feb 25 16:27:47 2013 -0800

    new kernel prebuilt

    includes:
    03589d9 mali: update manta_defconfig for new mali driver
    ea78724 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    c46ec8f mali: ARM Mali driver kernel trunk sync [revision 77586 (Asparagus)]
    d6d808a video: s3c-fb: Use new api to ion_share_dma_buf
    fbc35e2 Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4
    26cd0da sock_diag: Fix out-of-bounds access to sock_diag_handlers[]
    1a6c74e gpu: ion: Add support for sharing buffers with dma buf kernel handles
    99699c0 net: bluetooth: Remove the AID_NET_BT* gid numbers

    Change-Id: Id75893f9efeb96883a62bfd58c5b6c8d3ab9f75d
    Signed-off-by: Erik Gilling <konkers@android.com>

commit 4c8b560025763ba75903ac4b1328160baba0c33c
Merge: 8d226e0 60c5c68
Author: Martijn Coenen <maco@google.com>
Date:   Fri Feb 22 18:22:14 2013 +0000

    Merge "Manta: NFC: Enable polling for Kovio technology."

commit 60c5c68bedd0d65d8f2be3b97ca0b3b1a5deeb9f
Author: Martijn Coenen <maco@google.com>
Date:   Fri Feb 22 10:19:22 2013 -0800

    Manta: NFC: Enable polling for Kovio technology.

    Bug: 7222958
    Change-Id: I90de7db54a6e23b6259fa20a4f00c6d359d1be27

commit 8d226e08408ec8b3f11cfbae6a5bfbc64ea3644c
Merge: 0a86e03 0701eac
Author: Ken Sumrall <ksumrall@android.com>
Date:   Fri Feb 22 06:23:29 2013 +0000

    Merge "Update unified fstab.manta to support recovery"

commit 0a86e03779a533b1fd27e9c0e0a8feb8d3f66682
Author: Erik Gilling <konkers@android.com>
Date:   Wed Feb 20 13:44:55 2013 -0800

    new kernel prebuilt

    includes:
    6afd2c9 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    1e7b22a Merge branch 'android-3.4' into android-exynos-3.4
    e7a3217 sync: fix timeout = 0 wait behavior

    Change-Id: I4f6d9699f464739167f56482657732c3b367c3a0
    Signed-off-by: Erik Gilling <konkers@android.com>

commit b6965f55ed2a93c835f24cbea0ee05979233036d
Author: JP Abgrall <jpa@google.com>
Date:   Wed Feb 20 12:29:32 2013 -0800

    prebuilt kernel update (revert emmc packed write)

    0c9f6ef Revert "ARM: EXYNOS: Manta: Enable emmc 4.5 packed write support"

    Bug: 7768225
    Bug: 8157188
    Change-Id: Ife3ad3b11db5d372fb880b2a7fa3b5b89c4fa8ee

commit 2cff086c91f1d804f23bbcc703d6811c0d78e048
Merge: bdb0cba 212946d
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Feb 20 08:54:36 2013 -0800

    am 212946d3: Self-extractors for JDQ39

    * commit '212946d3ec70786b36494bc74991d4df747951db':
      Self-extractors for JDQ39

commit 0701eac4a2ee6c7ec0b8037a788f658833f7a0f2
Author: Ken Sumrall <ksumrall@android.com>
Date:   Tue Feb 19 17:33:18 2013 -0800

    Update unified fstab.manta to support recovery

    Add entries to the unified fstab needed by recovery.
    Also, copy the unified fstab to /etc/recovery.fstab in the recovery
    ramdisk.

    Change-Id: I68fab53bed4d901abdf95390cb0ec0db517b5a0e

commit bdb0cba3c56ae2c8d7a0325e645c426ac955e3a5
Author: JP Abgrall <jpa@google.com>
Date:   Tue Feb 19 16:37:55 2013 -0800

    prebuilt kernel update (jpeg clock)

    4f12ccc ARM: EXYNOS: manta: setup the jpeg clock
    3d6366c Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    b8066db ARM: EXYNOS: add CLK_SRC_GEN register to save list

    Change-Id: Ie3c6109141b10e6ee252e1f99193de20d64e1520

commit 212946d3ec70786b36494bc74991d4df747951db
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Feb 19 15:34:36 2013 -0800

    Self-extractors for JDQ39

    Change-Id: I2b5eacc145d0e33774f94e2fd121f1233c77274c

commit 8235e3326b07458383eea28ef12be39ba21d6b33
Merge: a96f227 95fc9c8
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Feb 19 14:40:48 2013 -0800

    am 95fc9c80: More reformatting for uniformity

    * commit '95fc9c80114e296a46e29fb577d532844f83cc0d':
      More reformatting for uniformity

commit 95fc9c80114e296a46e29fb577d532844f83cc0d
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Feb 19 14:37:27 2013 -0800

    More reformatting for uniformity

    Change-Id: I37cd6e62d6e4e4b35b6f4cf2c416b5916f42e56b

commit a96f227378a4f9436408fd1fd437b674f269616c
Merge: 34dc57d 131fbd4
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Feb 15 21:24:04 2013 -0800

    am 131fbd4c: Re-format for uniformity with other licenses

    * commit '131fbd4ca17d9899f8a45b3c8eedfb0d94e752cd':
      Re-format for uniformity with other licenses

commit 131fbd4ca17d9899f8a45b3c8eedfb0d94e752cd
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Feb 15 21:22:34 2013 -0800

    Re-format for uniformity with other licenses

    Change-Id: I61909c66d99643aa857f3e7251ffddbd2837fcc4

commit 34dc57dfa463115176fc96908b7db2839583d659
Merge: 8cde435 b289540
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Feb 15 20:33:12 2013 -0800

    am b2895402: Reformat licences to a uniform 77-column format

    * commit 'b28954022131fa377634cc2bfe4ed1825e40663a':
      Reformat licences to a uniform 77-column format

commit b28954022131fa377634cc2bfe4ed1825e40663a
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Feb 15 20:30:09 2013 -0800

    Reformat licences to a uniform 77-column format

    Change-Id: I1f2644d9107dfa64ca6f1cc78a22319161de85ac

commit 8cde4354674298ba1fa6d42b109ad7de3472854c
Author: Benoit Goby <benoit@android.com>
Date:   Fri Feb 15 16:28:48 2013 -0800

    manta: prebuilt kernel

    a43241f media: exynos-tv: Enable pre-multiplied alpha
    2ef21e3 ARM: exynos: manta: only scan 1-wire bus up to 5 times at boot

    Bug: 8175336
    Change-Id: I55cf160251e98b526baad78fa2cfb7378a6e0b74

commit af6c60c937bf6de4b752c4357aa15d9c6067552d
Merge: 611f374 5cb8c43
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Feb 14 09:34:39 2013 -0800

    am 5cb8c433: Factory images for JDP39

    # Via Jean-Baptiste Queru
    * commit '5cb8c433462e0f6cd27f755d8e31905bc459ae4a':
      Factory images for JDP39

commit 5cb8c433462e0f6cd27f755d8e31905bc459ae4a
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Feb 14 06:28:19 2013 -0800

    Factory images for JDP39

    Change-Id: Ic5ecef5e3219961b0dfcaa290a8258e5906239b4

commit 611f37407db197faf46ed0fa20a294b753759559
Author: Todd Poynor <toddpoynor@google.com>
Date:   Wed Feb 13 17:46:56 2013 -0800

    manta: prebuilt kernel

    e451619 power: smb347: update USB supply type according to source type
    cd17e99 Revert "ARM: exynos: manta: smb347: change USB/MAINS power supply type to UNKNOWN"
    695f3af Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    09562bc Merge branch 'android-3.4' into android-exynos-3.4
    c33ff3d power: android-battery: push uevent whenever charge source changes
    bb2a6f0 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    74cf996 Merge branch 'android-3.4' into android-exynos-3.4
    4bed54c power: android-battery: remove ac and usb supplies
    1c2b382 net: wireless: bcmdhd: Fix SUPPORT_PM2_ONLY option for p2p
    d37806b base: sync: Include seq_file.h in sync.h

    Change-Id: If64a376c389702bdc1e9a7649663620727b8d86b

commit c1af5a31f6222a98fcfba7deaae2912dd4f58d2b
Merge: 2291fd2 756c990
Author: Romain Guy <romainguy@google.com>
Date:   Wed Feb 13 19:28:48 2013 +0000

    Merge "Define a max size for the render buffers cache Bug #7146141"

commit 2291fd2c7594533e89232ed5a17243c51844c150
Merge: ae3cd39 a5dd790
Author: Martijn Coenen <maco@google.com>
Date:   Wed Feb 13 18:39:21 2013 +0000

    Merge "Remove unnecessary lines in PRODUCT_PACKAGES"

commit a5dd790773e673b2afdbfb262d24b6c3ef62be05
Author: Chih-Wei Huang <cwhuang@linux.org.tw>
Date:   Fri Dec 21 14:24:28 2012 +0800

    Remove unnecessary lines in PRODUCT_PACKAGES

    After applied https://android-review.googlesource.com/48504,
    NfcNci now depends on libnfc_nci_jni, and the latter depends on
    libnfc-nci. No need to list the libs in PRODUCT_PACKAGES.

    Change-Id: I19434a2cefb9ae39bdd8e9587c9e5d6f6021ba1d

commit ae3cd391d2b001f8f07934a028c648626f5ccd7e
Merge: 223659c 73502c1
Author: James Dong <jdong@google.com>
Date:   Wed Feb 13 18:20:04 2013 +0000

    Merge "Make software vp8 video encoder available to MediaCodec on Manta"

commit 73502c12ac1b3780a9cd9d35fe123bb8a41e4307
Author: James Dong <jdong@google.com>
Date:   Tue Feb 12 17:42:08 2013 -0800

    Make software vp8 video encoder available to MediaCodec on Manta

    Change-Id: Id3670ec8e7e88c300cabbd4ffd027070ce565890

commit 756c990b7b8bad88dde350ad54063275a81af738
Author: Romain Guy <romainguy@google.com>
Date:   Tue Feb 12 16:35:00 2013 -0800

    Define a max size for the render buffers cache
    Bug #7146141

    Change-Id: I7638ada8658b8561a1612e2be937e99d471ac348

commit 223659c164cd9b47dd255d7d300b21c02d36d778
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Feb 12 14:44:05 2013 -0800

    auto-generated blob list

    Bug: 4295425
    Change-Id: I073c22f5cad4dcae297bb94d702c47d11bf46f83

commit a89527fb467417ff68c9cdc39bed3eb9e8fad536
Author: Todd Poynor <toddpoynor@google.com>
Date:   Fri Feb 8 20:36:27 2013 -0800

    manta: power: interactive governor param updates for performance

    Bug: 8107018
    Change-Id: I7f8a4092e995501f2990fc7b439bd022447bc68c

commit 28978a1e7c2240bf771da4462450a812b1c8f7f6
Merge: 6fb4d37 56f40bf
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Feb 8 19:24:15 2013 +0000

    Merge "auto-generated blob list"

commit 56f40bf9ea9f8d8448dfce7b8d8b913cc2bb2829
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Feb 7 18:55:30 2013 -0800

    auto-generated blob list

    Bug: 4295425
    Change-Id: I24040d69c27a8ff22e285e291538bffefe1318d3

commit 6fb4d3794306fdf043f635db969cc98dbb3e5e31
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Feb 7 15:57:29 2013 -0800

    new kernel prebuilt

    2eec546 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    1782a78 ARM: exynos: manta: add g2d to board config
    0db30cb HACK: media: fimg2d: don't allow multiple concurrent clients
    fec3d9d media: fimg2d: avoid bool type in userspace-facing structs
    086de40 media: fimg2d: use wait queue on release instead of spinning
    ce0b396 media: fimg2d: replace custom profiling code with tracepoints
    3196e2d media: fimg2d: use dma-buf
    386fed1 media: fimg2d: make param checks more comprehensive and verbose
    4cb94d1 MEDIA: FIMG2D: add support of multi-plane yuv format
    1b8d958 MEDIA: FIMG2D: Support FIMG2D on SMDK5250 EVT1

    Change-Id: Ia4d8a944f193ecc1cfdfa4a68a8174d12f1c82d4
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit fced51fee56b2ee49824dac86ec4a42e9aed8ca0
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Jan 14 15:47:56 2013 -0800

    manta: give mediaserver access to g2d

    Change-Id: Ie1b149383c914c3346d8c99b287b579a9ceb8000
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit 7bd24738464e5e021d05f909136c2c1f49a27eda
Author: JP Abgrall <jpa@google.com>
Date:   Thu Feb 7 13:39:20 2013 -0800

    prebuilt kenerl (qtaguid lo, bcmdhd 1.28-27, mali, sync)

    1d6bfee Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    0fdbc80 Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4
    ab3801e netfilter: xt_qtaguid: Allow tracking loopback
    3afcb73 net: wireless: bcmdhd: Update to Version 1.28-27
    d698350 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    2ec1063 Merge branch 'android-3.4' into android-exynos-3.4
    1f0efba mali-t6xx: removed abuse of list item "dep_item[0]"
    c74bcbb mali-t6xx: Debug info added to track GPU reset path
    9524376 sync: don't log wait timeouts when timeout = 0

    Change-Id: Iab705bef003b10181969ca8c31286b2e5935f4e7

commit 668c139fc73e8e47958cd9d4f6c155675bb1545b
Author: Todd Poynor <toddpoynor@google.com>
Date:   Wed Feb 6 19:39:56 2013 -0800

    manta: power: interactive governor params update for power

    Adjust target_loads in the middle range to help power in certain usages.

    Bug: 8107018
    Change-Id: I5c516be2b98fbb3e64de0281508527cecabb18bb

commit 80ad7a2ae3aefab025e9aada9158efb66b5d854f
Author: Robert Greenwalt <rgreenwalt@google.com>
Date:   Wed Dec 5 12:14:47 2012 -0800

    Fix BT rev-tether iface name.

    Change-Id: I353636c04d9dc5eb9432e29cb7be701507b149a1

commit 3fbe7bc5a57e425f6852e1e4bc860fbd47faeb1e
Merge: c968999 2f4e38f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Feb 5 13:52:44 2013 -0800

    am 2f4e38f0: (-s ours) Reconcile with jb-mr1.1-release - do not merge

    # Via The Android Automerger (1) and The Android Open Source Project (1)
    * commit '2f4e38f0621586ed3b53ed0ad1827bffe18a1ff9':

commit 2f4e38f0621586ed3b53ed0ad1827bffe18a1ff9
Merge: 1dad129 5a2f2bf
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Feb 5 13:49:43 2013 -0800

    Reconcile with jb-mr1.1-release - do not merge

    Change-Id: I3dfd8ee0a7c0013cd1bb0d39f6fbd745677f5d90

commit c968999749e524a4beff985dca8c15ae2ecc6413
Author: Todd Poynor <toddpoynor@google.com>
Date:   Mon Feb 4 15:37:34 2013 -0800

    manta: power: interactive governor updates to boost performance

    Lower target_loads below 1.4G
    above hispeed delay 100ms -> 80ms

    Bug: 8107018
    Change-Id: I74a9d1c2253cee8a98c4553de1bb3f1b9ee994ea

commit b03f7930b65a11593d2139bd95e9f406dff9ba9f
Author: Erik Gilling <konkers@android.com>
Date:   Mon Feb 4 14:56:17 2013 -0800

    new kernel prebuilt

    includes:
    d698350 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    2ec1063 Merge branch 'android-3.4' into android-exynos-3.4
    1f0efba mali-t6xx: removed abuse of list item "dep_item[0]"
    c74bcbb mali-t6xx: Debug info added to track GPU reset path
    9524376 sync: don't log wait timeouts when timeout = 0

    Change-Id: I8e3f3b63f40fa5a98d094a45aa8f41affde03dcf
    Signed-off-by: Erik Gilling <konkers@android.com>

commit a29bcf6de0267552d260027d028eacf0e511e239
Merge: 64975f7 b52afc8
Author: Eric Laurent <elaurent@google.com>
Date:   Thu Jan 31 22:40:55 2013 +0000

    Merge "audio: added support for dual mic capture."

commit 64975f7b90676eea03559ce7938ff3aebcbaa8c8
Author: JP Abgrall <jpa@google.com>
Date:   Tue Jan 29 16:25:08 2013 -0800

    Prebuilt kernel update (ignore EDID, fix therm throttle, qtaguid stats)

    37b31be Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    5b6c3e6 Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4
    66a34b8 video: s5p-dp: warn and succeed on EDID checksum errors
    7dae1ee ARM: EXYNOS: fix thermal throttle on TMU_STATUS_THROTTLED
    01d1733 netfilter: xt_qtaguid: extend iface stat to report protocols

    Bug: 7358899
    Bug: 8096803
    Bug: 7903145
    Change-Id: I1d0c2d3d1f0b221091f74414d8e3a34e8339f02a

commit c5031904975eaaf9d4e4c67f9c7b0276eb157348
Merge: 10f2a07 759c6f0
Author: Simon Wilson <simonwilson@google.com>
Date:   Tue Jan 29 20:04:12 2013 +0000

    Merge "audio: factor out audio_route into a separate library"

commit 10f2a07c58275853b9849b88d69eb6f7552f89df
Author: JP Abgrall <jpa@google.com>
Date:   Mon Jan 28 17:29:21 2013 -0800

    prebuilt kernel (ext4 extra security attributes)

    615e897 ARM: EXYNOS: manta: defconfig: enable ext4 extended security attributes

    Bug: 8069151
    Change-Id: I09440a920f2680bafa4d51fc73ac48934d36e7bb

commit 759c6f0c54d2440262ce4022f7f13d85c92c331b
Author: Simon Wilson <simonwilson@google.com>
Date:   Tue Jan 15 16:38:56 2013 -0800

    audio: factor out audio_route into a separate library

    audio_route is mature enough now to belong in its
    own library and will help remove duplication across
    audio HALs.

    Change-Id: I916d7eba322a0294e223cf32e08764a3df09a89c

commit b52afc8acba0896e8f35d86e75a730d7d009b09d
Author: Eric Laurent <elaurent@google.com>
Date:   Fri Jan 18 15:12:57 2013 -0800

    audio: added support for dual mic capture.

    Added support for simultaneous capture from front and back
    mics.

    Noise suppression is turned off when capturing from front and back
    mics and the input source is voice recognition.

    Change-Id: I1750f2634bfa75f611dfded0ca21a295c752a836

commit 4886499f1c03deaa6d9efe301be1872a22aef757
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Jan 16 11:38:30 2013 -0800

    New prebuilt kernel

    2a7d1d5 Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-e
    697ed7b Merge remote-tracking branch 'common/android-3.4' into android-exynos-3
    176fbaa net: wireless: bcmdhd: Update to Version 1.28-24
    c8871a9 net: wireless: bcmdhd: Fix PEAP with dynamic WEP
    05c6158 gpu: ion: Only flush buffers in the chunk heap if they were used cached
    7994db1 gpu: ion: Refactor the code to zero buffers
    386f830 exynos: ion: Add ion chunk heap
    2df825d arm: exynos: manta: Move persistent ram init to machine reserve
    688bd82 sync: Fix race condition between merge and signal

    Change-Id: I8febb89809595a1a490ec1add96cf0e32522411f
    Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>

commit 939ce33a8ecb89dd220def7fc8beccd5680ea070
Author: Ben Cheng <bccheng@google.com>
Date:   Mon Jan 14 13:52:28 2013 -0800

    Add TARGET_CPU_VARIANT := cortex-a15 for Manta.

    -mcpu=cortex-a15 will be derived from it and passed to GCC.

    Bug: 7961327.
    Change-Id: Ia5e939c9308745914aa3a47ae150097294b3929b

commit f3d946310bd1f5d2d6f829d8c4a2951bbbe591b4
Merge: 53de4ec 1dad129
Author: JP Abgrall <jpa@google.com>
Date:   Thu Jan 10 15:39:02 2013 -0800

    am 1dad1297: (-s ours) am eae5a871: am 7f6968fb: manta: prebuilt kernel -- DO NOT MERGE

    * commit '1dad12978071e59c0a94034d973855729b8b6f54':
      manta: prebuilt kernel -- DO NOT MERGE

commit 53de4eca5973a6c4d4bd2b966f753901cfdb9743
Author: JP Abgrall <jpa@google.com>
Date:   Wed Jan 9 17:58:38 2013 -0800

    New prebuilt kernel (thermal throttle, battery gauge, cpufreq, qtaguid)

    075d053 Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    2a3fb08 ARM: EXYNOS: Fix thermal throttle once tripping
    f1ed295 Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    2cf19c1 Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4
    cc00275 ARM: exynos: manta: battery: only print no fuel gauge error once
    4161a11 cpufreq: interactive: fix race on governor start/stop
    7c060bf netfilter: xt_qtaguid: remove AID_* dependency for access control

    Change-Id: Id80ec24b81e708bffbf4f64b08e456897e75ee55

commit 5a2f2bf0bddf832fccd61b688e182e8e89a953a8
Merge: 7f6968f 5ae6544
Author: The Android Automerger <android-build@android.com>
Date:   Wed Jan 9 15:47:18 2013 -0800

    merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

commit cacc750d7e2c7fabb2dc453d758b37fedc2bd477
Author: Seong-Jeong JU <sj.joo@samsung.com>
Date:   Mon Nov 19 14:13:48 2012 +0900

    ARM: exynos: Manta: Change gps binary to lastest version

    This version is 4_1_3.19.204.150486 and resolved new 'Native Crash' problem.
    There was a native crash issue in another model using BRCM gps chipset.

    Cause:
    In internal sort function, we iterates and copies SV # from list into array.

    In this iteration, we didn't check end of array during iteration. So, if list length were larger than array, we're coping into wrong memory which is not part of array and this caused stack corruption

    Solution:
    Fixed recent crash caused by stack corruption.

    Change-Id: I9f600f49ba2fa745c2bb357fcd0aafc5b9f2079e
    Signed-off-by: Seong-Jeong JU <sj.joo@samsung.com>

commit 1dad12978071e59c0a94034d973855729b8b6f54
Merge: 6874c73 eae5a87
Author: JP Abgrall <jpa@google.com>
Date:   Wed Jan 9 11:38:24 2013 -0800

    am eae5a871: am 7f6968fb: manta: prebuilt kernel -- DO NOT MERGE

    * commit 'eae5a871112af2d1f7361edfdc627c3388c6bf7c':
      manta: prebuilt kernel -- DO NOT MERGE

commit eae5a871112af2d1f7361edfdc627c3388c6bf7c
Merge: bd7f2fb 7f6968f
Author: JP Abgrall <jpa@google.com>
Date:   Wed Jan 9 11:35:24 2013 -0800

    am 7f6968fb: manta: prebuilt kernel -- DO NOT MERGE

    * commit '7f6968fb3ac8fc14036428b7dfca1c26fc42d5a8':
      manta: prebuilt kernel -- DO NOT MERGE

commit 7f6968fb3ac8fc14036428b7dfca1c26fc42d5a8
Author: JP Abgrall <jpa@google.com>
Date:   Tue Jan 8 20:13:42 2013 -0800

    manta: prebuilt kernel -- DO NOT MERGE

    af9c307 ARM: EXYNOS: Fix thermal throttle once tripping

    Bug:7958312
    Change-Id: I3c9d176f59ea763d80a82789e17d0008805f5761

commit 86853cf3e090272b3437565b35f2c2b645d1d7df
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Thu Jan 3 17:02:27 2013 -0800

    New prebuilt kernel

    66fd242 Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-ex
    75d6c8c Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.
    b5e05c3 ARM: exynos: manta: increase mem clock in mali dvfs
    f5a3b2b gpu: ion: Modify zeroing code so it only allocates address space once

    Change-Id: I482b9b5fd71a51e1797c56fbfd9bc8c1f2543f59
    Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>

commit 89867a115ed0a6834e93b1d45a4593396517c568
Author: Todd Poynor <toddpoynor@google.com>
Date:   Wed Jan 2 15:11:23 2013 -0800

    manta: prebuilt kernel

    2b78663 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    08ba187 Merge branch 'android-3.4' into android-exynos-3.4
    cf70cfa cpufreq: interactive: fix deadlock on spinlock in timer
    8e2dfe1 cpufreq: interactive: don't handle transition notification if not enabled
    24942b2 cpufreq: interactive: init default values at compile time
    f920841 cpufreq: interactive: default go_hispeed_load 99%, doc updates

    Change-Id: I2819690e011ea8292f8c7d913794c154e059cbea

commit 4bdcbe3e65b9972b7437be3819542fe5c64e9031
Author: Seong-Jeong JU <sj.joo@samsung.com>
Date:   Fri Nov 9 17:40:10 2012 -0800

    ARM: exynos: manta: Change gps binary to resolve bug7315567

    Bug7315567 - Multiple native orashes in /system/vendor/bin/gpsd

    Cause: This issue is a bug related to bad time decode on Glonass SV and timemanager in GLL.
    Solution: Broadcom released new binary including patch to prevent GLNS decoding error.

    Bug: 7315567
    Change-Id: Ie607eaeb91c5a35910fb6c01c1ba068db9ff9800
    Signed-off-by: Seong-Jeong JU <sj.joo@samsung.com>

commit 9d71152c53c2dff211aa36206639008fb948f49a
Merge: 2983dc2 6874c73
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Dec 28 09:48:56 2012 -0800

    am 6874c738: Packages for JDP82

    * commit '6874c7384b85521c3a4efa44a96a4f409ce01b39':
      Packages for JDP82

commit 6874c7384b85521c3a4efa44a96a4f409ce01b39
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Dec 27 09:04:47 2012 -0800

    Packages for JDP82

    Change-Id: I137a53440aaa5a8118b64698865018ebb67a20c5

commit 2983dc2182e0500284470d84ce73697127046763
Author: JP Abgrall <jpa@google.com>
Date:   Thu Oct 25 09:55:35 2012 -0700

    libsensors: remove unused incorrect sensor defines

    Get rid of the the SENSORS_xxx (1 << ID_yyy).
      ID_L was 4096
      SENSORS_LIGHT was (1 << ID_L)

    Change-Id: I3f8365a4c1bac23f0a380e55389960036f7dee19

commit 3d96702f1676925b975f2aba2e33796fd97a2d88
Author: JP Abgrall <jpa@google.com>
Date:   Mon Oct 22 12:42:18 2012 -0700

    sensors: support Invensense MLP 5.1.2

    * try to deal with DMP for display orientation
    * remove the isValid() check, as the failure is handled more gracefully
    in the HAL.
    * enable uevent handling for needed entries.
    * tweak lock inits

    Change-Id: Iccb8dc8f9bd110d99875a56dd406419f3db7f762

commit 87fb5694369366f2fbbd6b97e0891e886f306cc9
Author: Todd Poynor <toddpoynor@google.com>
Date:   Thu Dec 20 18:12:13 2012 -0800

    manta: prebuilt kernel

    22d6e68 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    36d50d6 Merge branch 'android-3.4' into android-exynos-3.4
    dd09e0f cpufreq: interactive: fix race on timer restart on governor start
    db62f65 ARM: exynos: manta: dump DBGPCSR on panic
    b9f4930 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    b55c2a4 Merge branch 'android-3.4' into android-exynos-3.4
    052ca40 cpufreq: interactive: fix racy timer stopping

    Change-Id: I542b29bc308008d280faed680e6b661ab3522afc

commit f3e6a6761be2c9f50051e60bb397e598501f3b36
Author: Todd Poynor <toddpoynor@google.com>
Date:   Wed Dec 19 19:00:34 2012 -0800

    manta: power: interactive governor params update

    timer_slack 20ms (up to 20ms deferrable timer beyond timer_rate 20ms).

    target loads:
       85% below 1G
       90% 1G, increasing by 2% each speed step until
       99% 1.5G and above

    go_hispeed_load 99% (basically deprecated in favor of input boost).

    above_hispeed_delay 100ms for each step above 1G.

    Change-Id: I331620f8d4f0add0640f5620cafa2a793df81205

commit a2b7634cf0cd0981edc6415104251895d547bf3e
Author: Todd Poynor <toddpoynor@google.com>
Date:   Wed Dec 19 17:04:27 2012 -0800

    manta: prebuilt kernel

    cd24a39 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    2124389 Merge branch 'android-3.4' into android-exynos-3.4
    e792d75 cpufreq: interactive: fix boosting logic
    9554c41 net: wireless: bcmdhd: Update to Version 1.28-23
    0cbb21f net: wireless: bcmdhd: Postpone taking wd_wake lock

    Change-Id: I207b4bbabfc3502c8eaa1f2d2a3b12f5179b10bf

commit 8f8961bf3a807692970dd773c46999c991ed57ad
Merge: 1e839b8 b2f75a1
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Dec 19 14:35:36 2012 -0800

    am b2f75a12: (-s ours) Reconcile with jb-mr1.1-release - do not merge

    * commit 'b2f75a1294e45c47b5b961e3c22a0d0fb28615b1':

commit b2f75a1294e45c47b5b961e3c22a0d0fb28615b1
Merge: 91131f8 5ae6544
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Dec 19 14:33:37 2012 -0800

    Reconcile with jb-mr1.1-release - do not merge

    Change-Id: I0c6fd4c96a2f38dd895fcaa223c4c33ea2c5e32a

commit 1e839b8da4f33282c64c410d379c1214ed14e1b7
Merge: 1f00e3f 7049f69
Author: JP Abgrall <jpa@google.com>
Date:   Wed Dec 19 14:33:12 2012 -0800

    Merge "kernel prebuilt (iio/mpu support 2nd DMP image)"

commit 5ae6544b2207a783c6e01c7cc87af22bf63568cc
Merge: f3deda7 7899712
Author: The Android Automerger <android-build@android.com>
Date:   Wed Dec 19 14:29:53 2012 -0800

    merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

commit 1f00e3fdf967aefc49dae290a50afae795125dc2
Merge: f4172d5 91131f8
Author: Colin Cross <ccross@android.com>
Date:   Wed Dec 19 14:14:32 2012 -0800

    am 91131f8b: (-s ours) am bd7f2fb2: am f3deda79: manta: prebuilt kernel -- DO NOT MERGE

    * commit '91131f8bf2be0252cee361fb3f36504951372e62':
      manta: prebuilt kernel -- DO NOT MERGE

commit 91131f8bf2be0252cee361fb3f36504951372e62
Merge: 14f98d5 bd7f2fb
Author: Colin Cross <ccross@android.com>
Date:   Wed Dec 19 14:13:24 2012 -0800

    am bd7f2fb2: am f3deda79: manta: prebuilt kernel -- DO NOT MERGE

    * commit 'bd7f2fb2acfad801ac4bcc19b2f428afa0034235':
      manta: prebuilt kernel -- DO NOT MERGE

commit bd7f2fb2acfad801ac4bcc19b2f428afa0034235
Merge: 9b0d4c8 f3deda7
Author: Colin Cross <ccross@android.com>
Date:   Wed Dec 19 14:11:57 2012 -0800

    am f3deda79: manta: prebuilt kernel -- DO NOT MERGE

    * commit 'f3deda7922a138f09ab02b352b02d8e1dc8064d6':
      manta: prebuilt kernel -- DO NOT MERGE

commit f3deda7922a138f09ab02b352b02d8e1dc8064d6
Author: Colin Cross <ccross@android.com>
Date:   Wed Dec 19 13:58:29 2012 -0800

    manta: prebuilt kernel -- DO NOT MERGE

    cf02b75 gpu: ion: Modify zeroing code so it only allocates address space once

    Change-Id: I961ffafb7c123d747ba2b774fb4cfb6f85e42999

commit 7049f699236ef29b8996693d4edfa6f4e655d6d1
Author: JP Abgrall <jpa@google.com>
Date:   Wed Dec 19 12:30:35 2012 -0800

    kernel prebuilt (iio/mpu support 2nd DMP image)

    7c25610 iio: Invensense MPU: support mutiple DMP CRCs.

    Change-Id: Ia02502d4a54dadd96584e2ea4d9bc2da6d4e00fb

commit f4172d50fe8f3585813bc4c8382e74133abd4b85
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Dec 19 09:58:21 2012 -0800

    new kernel prebuilt

    f35eb0d Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    dc61b21 video: s3c-fb: pass a mask of the id to ion_alloc
    b76f599 ion: exynos: point the masks at the heap ids and not types
    5335022 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    a221e42 Merge branch 'android-3.4' into android-exynos-3.4
    16ee0d1 cpufreq: interactive: add timer slack to limit idle at speed > min
    16936dc Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    fc37b2f Merge branch 'android-3.4' into android-exynos-3.4
    a4b4121 hardlockup: detect hard lockups without NMIs using secondary cpus
    c5aa761 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    d903b0c media: exynos: gsc-m2m: don't allow open devices to be reopened
    9ce22b9 cpufreq: interactive: specify duration of CPU speed boost pulse
    e714397 cpufreq: interactive: adjust load for changes in speed
    e0d953b Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    1dec9eb Merge remote-tracking branch 'common/android-3.4' into exynos/androdid-exynos-3.4
    cd56ef0 gpu: ion: Remove heapmask from client
    8869966 gpu: ion: Export ion_client_create
    ac3da73 gpu: ion: Clarify variable names and comments around heap ids v types
    2faceab gpu: ion: Add chunk heap
    a103597 gpu: ion: Refactor common mapping functions out of system heap
    a910c8c gpu: ion: Switch heap rbtree to a prio list
    7e59bc5 gpu: ion: Fix bug where MAP ioctl was no longer supported
    2befe9c gpu: ion: Modify reserve function for carveouts with no start address
    d293502 exynos: manta: Move ion initialization to machine reserve
    e33f614d exynos: smdk5250: Move ion initialization to machine reserve
    5c2bad3 video: s3c-fb: Fix call to ion alloc to use the id instead of the type
    bc834d9 arm: exynos: Fix dev ion to use heap ids instead of types
    741daab arm: exynos: Modify heap creation code
    0eb202b exynos: Update to use new api to ion_client_create
    29f10ea cpufreq: interactive: remove load since last speed change
    dac27a6 cpufreq: interactive: allow arbitrary speed / target load mappings
    f917b6a ASoC: wm8994: Lower AIFnCLK divisor when dropping to 32kHz
    a4da3bd ARM: exynos: manta: wlan: Use XY/9 as universal locale
    963ad40 gpu: mali-t6xx: remove dependency of specific board
    f260438 i2c: s3c2410: remove compile warning related to unused variable
    7c74851 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    14e9ad5 media: exynos: mfc: don't deref curr_ctx for dev-global irq reasons
    bdb6717 media: exynos: mfc: don't drop wakeup source in multiple context case
    422cf62 media: exynos: mfc: reject suspend if the MFC is busy
    57bae2f Log when a device on a mmc bus is hw reset
    b2aeba1 gpu: ion: fix compilation warning
    fb06550 gpu: ion: fix carveout ops
    2eda6bd media: exynos: mfc: print some debug info in irq on invalid context
    78290a2 gpu: ion: Fix bug in zeroing pages in system heap
    54ef716 ARM: exynos: manta: disable CONFIG_JUMP_LABEL
    ee87255 mmc: dw_mmc: fix to clear interrupt pending when exception
    3335b1d media: exynos: mfc: fix ctx wake up of uninterruptible tasks
    35a84de cpufreq: interactive: apply above_hispeed_delay to each step above hispeed
    11ecccb cpufreq: interactive: change speed according to current speed and target load
    36d7db7 cpufreq: interactive: trace actual speed in target speed decisions
    bae4417 android: logger: enforce GID and CAP check on log flush
    a1b7a37 usb: gadget: accessory: Fix section mismatch (again)
    51b7b9a mali: fix section mismatch
    9002e53 media: exynos: mfc: get rid of interruptible dev/ctx wait_events
    e14c1e3 media: exynos: mfc: do not release firmware buffer when drm is enabled
    23aefaa media: exynos: s5p-mfc: prevent suspend while MFC is in use
    ec18038 mmc: dw_mmc: add to clear HLE interrupt
    f23ce86 ARM: exynos: manta: reserve 384MB for mali driver
    69b28fc Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    6e4a9c8 gpu: mali: add a carveout for gpu memory
    661c9b2 gpu: mali: get rid of kbase_page_metadata
    ef80ff9 mali: mark kbase_pm workqueue WQ_MEM_RECLAIM
    fa54be0 ARM: exynos: manta: Enable sched scan for wlan
    226ff53 net: wireless: bcmdhd: Increase PNO wakelock to 7 sec
    0310b9d netfilter: qtaguid: Don't BUG_ON if create_if_tag_stat fails

    Change-Id: I9d62f73d09cbfff941a3bcee600df6b406828562
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit 077af0ae9253759b10369736c86f49d5c870f086
Merge: 43a73e0 14f98d5
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Dec 18 15:52:39 2012 -0800

    am 14f98d5a: Merge from AOSP staging branch

    * commit '14f98d5acdb00aea40550e80bc20a76e20257c3f':
      Generate fixed JOP40C factory images
      JOP40D factory images for Manta

commit 14f98d5acdb00aea40550e80bc20a76e20257c3f
Merge: ea208f9 9eb4931
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Dec 18 15:12:35 2012 -0800

    Merge from AOSP staging branch

    Change-Id: Ifbe07dbd8f0e906c48c6bd0830db733b3aa8de71

commit 43a73e04a456a9d053e8f3ff192e2fe68ca01361
Merge: 5f1a503 ea208f9
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Dec 18 09:46:43 2012 -0800

    am ea208f95: (-s ours) Reconcile with jb-mr1.1-release - do not merge

    * commit 'ea208f9540852d6286ece8b51b4e6bca1d0db417':

commit ea208f9540852d6286ece8b51b4e6bca1d0db417
Merge: 7b34ea7 7899712
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Dec 18 09:44:19 2012 -0800

    Reconcile with jb-mr1.1-release - do not merge

    Change-Id: Icd7ed5b4635a42610c2a9d41ca4ba2df674b2da0

commit 5f1a503f4a4419ba8d3987f2ea0fa4cedb984003
Merge: 17a5749 7b34ea7
Author: Todd Poynor <toddpoynor@google.com>
Date:   Mon Dec 17 23:44:43 2012 -0800

    am 7b34ea78: (-s ours) am 9b0d4c8a: am 571914a7: manta: prebuilt kernel -- DO NOT MERGE

    * commit '7b34ea7806991f1a27146222588b402f46b77584':
      manta: prebuilt kernel -- DO NOT MERGE

commit 78997121f567854a78376ee6e567919f128ad49c
Merge: 571914a 1c68ad6
Author: The Android Automerger <android-build@android.com>
Date:   Mon Dec 17 20:49:27 2012 -0800

    merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

commit 7b34ea7806991f1a27146222588b402f46b77584
Merge: aadc718 9b0d4c8
Author: Todd Poynor <toddpoynor@google.com>
Date:   Mon Dec 17 20:48:26 2012 -0800

    am 9b0d4c8a: am 571914a7: manta: prebuilt kernel -- DO NOT MERGE

    * commit '9b0d4c8a3efa27475a40193bcbf3be0725da6a16':
      manta: prebuilt kernel -- DO NOT MERGE

commit 9b0d4c8a3efa27475a40193bcbf3be0725da6a16
Merge: 111b65f 571914a
Author: Todd Poynor <toddpoynor@google.com>
Date:   Mon Dec 17 20:44:59 2012 -0800

    am 571914a7: manta: prebuilt kernel -- DO NOT MERGE

    * commit '571914a739cf55c8f15c8abadc708fef02811b7d':
      manta: prebuilt kernel -- DO NOT MERGE

commit 571914a739cf55c8f15c8abadc708fef02811b7d
Author: Todd Poynor <toddpoynor@google.com>
Date:   Mon Dec 17 20:33:18 2012 -0800

    manta: prebuilt kernel -- DO NOT MERGE

    5212f28 ARM: exynos: manta: increase mem clock in mali dvfs
    0743531 cpufreq: interactive: specify duration of CPU speed boost pulse

    Change-Id: I5ba53924d7a2eb02d9ad66460200dc14875019d7

commit 17a57499af6f6347cfa5f667c5a78738b4cb7b4f
Merge: cb598b6 aadc718
Author: Todd Poynor <toddpoynor@google.com>
Date:   Mon Dec 17 14:01:10 2012 -0800

    am aadc718c: am 111b65fe: am ae4ee473: manta: power: set CPU boost on input to 500ms

    * commit 'aadc718c62335841efd68ff2682326f22955b90b':
      manta: power: set CPU boost on input to 500ms

commit aadc718c62335841efd68ff2682326f22955b90b
Merge: 9118a1b 111b65f
Author: Todd Poynor <toddpoynor@google.com>
Date:   Mon Dec 17 13:59:40 2012 -0800

    am 111b65fe: am ae4ee473: manta: power: set CPU boost on input to 500ms

    * commit '111b65fecec53649ea75b1f6a46dbc2ea178c715':
      manta: power: set CPU boost on input to 500ms

commit 111b65fecec53649ea75b1f6a46dbc2ea178c715
Merge: 855eea4 ae4ee47
Author: Todd Poynor <toddpoynor@google.com>
Date:   Mon Dec 17 13:57:37 2012 -0800

    am ae4ee473: manta: power: set CPU boost on input to 500ms

    * commit 'ae4ee4734b5125085175ecb3aadc9b392835eafc':
      manta: power: set CPU boost on input to 500ms

commit cb598b66911ff7bfe3025271d2e8e675d7c7d188
Merge: 3dbc47f 9118a1b
Author: Todd Poynor <toddpoynor@google.com>
Date:   Mon Dec 17 13:51:44 2012 -0800

    am 9118a1b6: (-s ours) am 855eea43: am 8008667b: manta: prebuilt kernel -- DO NOT MERGE

    * commit '9118a1b67ba78a058ef48261ca3fee6edc56e923':
      manta: prebuilt kernel -- DO NOT MERGE

commit 9118a1b67ba78a058ef48261ca3fee6edc56e923
Merge: bf4a8c9 855eea4
Author: Todd Poynor <toddpoynor@google.com>
Date:   Mon Dec 17 13:49:46 2012 -0800

    am 855eea43: am 8008667b: manta: prebuilt kernel -- DO NOT MERGE

    * commit '855eea43dd94e69967ee7be0fdab0355972163cf':
      manta: prebuilt kernel -- DO NOT MERGE

commit ae4ee4734b5125085175ecb3aadc9b392835eafc
Author: Todd Poynor <toddpoynor@google.com>
Date:   Mon Dec 17 13:49:30 2012 -0800

    manta: power: set CPU boost on input to 500ms

    Change-Id: I05743cb2fa0706b96e218e413460d6d1362cd03d

commit 855eea43dd94e69967ee7be0fdab0355972163cf
Merge: dcec4df 8008667
Author: Todd Poynor <toddpoynor@google.com>
Date:   Mon Dec 17 13:48:45 2012 -0800

    am 8008667b: manta: prebuilt kernel -- DO NOT MERGE

    * commit '8008667ba3c8dc253b5c63adb2f92a7b4c6ca906':
      manta: prebuilt kernel -- DO NOT MERGE

commit 8008667ba3c8dc253b5c63adb2f92a7b4c6ca906
Author: Todd Poynor <toddpoynor@google.com>
Date:   Mon Dec 17 13:29:14 2012 -0800

    manta: prebuilt kernel -- DO NOT MERGE

    0743531 cpufreq: interactive: specify duration of CPU speed boost pulse

    Change-Id: I94b74cf357c6e18856374a53337c65886c72e736

commit 3dbc47fefabe3bf5f47fa74206c23cada8f15f33
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Thu Dec 13 11:23:02 2012 -0800

    wifi: Use XY/9 locale with improved Tx power

    Change-Id: I324088926d8fb84b56b096c1e0bb184d9ffd1208
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit adbfe1f7c8c49d4099553b95d0958975ace1fa53
Merge: 20d592c bf4a8c9
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Dec 12 07:36:22 2012 -0800

    am bf4a8c98: (-s ours) Reconcile with jb-mr1.1-release - do not merge

    * commit 'bf4a8c986b04927b24d8cc39bf96c3a8052858d2':

commit bf4a8c986b04927b24d8cc39bf96c3a8052858d2
Merge: 686cb28 1c68ad6
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Dec 12 07:33:55 2012 -0800

    Reconcile with jb-mr1.1-release - do not merge

    Change-Id: Ib8fd659f8c46227f8f037659bd804a0ca362f0e0

commit 1c68ad60235367cb57a1e40a30c3465ff12af587
Merge: 45f7b00 114a6a4
Author: The Android Automerger <android-build@android.com>
Date:   Tue Dec 11 15:56:14 2012 -0800

    merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

commit 20d592c3e7232fbe7e54caa593408bb04d3a299e
Merge: 5bd3577 686cb28
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Dec 11 11:56:57 2012 -0800

    am 686cb28a: (-s ours) Reconcile with jb-mr1.1-release - do not merge

    * commit '686cb28a9d69b9cbf1614c18cc752f5b78f5c57e':

commit 686cb28a9d69b9cbf1614c18cc752f5b78f5c57e
Merge: 97a6dea 114a6a4
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Dec 11 11:54:08 2012 -0800

    Reconcile with jb-mr1.1-release - do not merge

    Change-Id: I4f7de61cda9f470dc0bf7540a18db8f727fa79d3

commit 5bd35774148c8a0dbca909be10d3a2e495b216b7
Merge: 1dcec5f 97a6dea
Author: Dima Zavin <dima@android.com>
Date:   Tue Dec 11 10:59:29 2012 -0800

    am 97a6dea4: (-s ours) am dcec4dff: am 45f7b004: manta: update prebuilt kernel -- DO NOT MERGE

    * commit '97a6dea44b7034c59c0ba35c9bb163716874c6e6':
      manta: update prebuilt kernel -- DO NOT MERGE

commit 97a6dea44b7034c59c0ba35c9bb163716874c6e6
Merge: 7e9905f dcec4df
Author: Dima Zavin <dima@android.com>
Date:   Tue Dec 11 10:56:52 2012 -0800

    am dcec4dff: am 45f7b004: manta: update prebuilt kernel -- DO NOT MERGE

    * commit 'dcec4dff9be949f9fcdda1deffbfec68811e9260':
      manta: update prebuilt kernel -- DO NOT MERGE

commit dcec4dff9be949f9fcdda1deffbfec68811e9260
Merge: 18d1fc7 45f7b00
Author: Dima Zavin <dima@android.com>
Date:   Tue Dec 11 10:55:08 2012 -0800

    am 45f7b004: manta: update prebuilt kernel -- DO NOT MERGE

    * commit '45f7b0040bca7e749a6be9efca43ae0b3236bb8b':
      manta: update prebuilt kernel -- DO NOT MERGE

commit e3a69810250866d293a5df3581aae2ad8d51982e
Author: rpcraig <rpcraig@tycho.ncsc.mil>
Date:   Tue Dec 11 13:14:14 2012 -0500

    Initial security policy.

    Change-Id: I0f394bb68952476baa74e0db62ad7436d6c6b2bf
    Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

commit 45f7b0040bca7e749a6be9efca43ae0b3236bb8b
Author: Dima Zavin <dima@android.com>
Date:   Tue Dec 11 10:17:03 2012 -0800

    manta: update prebuilt kernel -- DO NOT MERGE

    fee2975 media: exynos: mfc: don't deref curr_ctx for dev-global irq reasons
    eb3fa53 media: exynos: mfc: don't drop wakeup source in multiple context case
    1bfd620 media: exynos: mfc: reject suspend if the MFC is busy

    Bug: 7261738
    Change-Id: I884becae53f8d2c19f9f9a178c6a4c79c24fff8a
    Signed-off-by: Dima Zavin <dima@android.com>

commit 1dcec5fa17a6512f539deb8bd8a33cd336f2b04b
Merge: 7884610 7e9905f
Author: Ken Sumrall <ksumrall@android.com>
Date:   Mon Dec 10 19:50:08 2012 -0800

    am 7e9905f5: (-s ours) am 18d1fc74: am d555bc0b: manta: update kernel prebuilt -- DO NOT MERGE

    * commit '7e9905f533eb23316543b9a336084d2fcc3edbea':
      manta: update kernel prebuilt -- DO NOT MERGE

commit 114a6a41ecec63f902191794a03acc4f296d150e
Merge: d555bc0 21972ea
Author: The Android Automerger <android-build@android.com>
Date:   Mon Dec 10 19:33:27 2012 -0800

    merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

commit 7e9905f533eb23316543b9a336084d2fcc3edbea
Merge: 9e69716 18d1fc7
Author: Ken Sumrall <ksumrall@android.com>
Date:   Mon Dec 10 18:19:04 2012 -0800

    am 18d1fc74: am d555bc0b: manta: update kernel prebuilt -- DO NOT MERGE

    * commit '18d1fc74e7f7285e846fd645f03b5f3c0119f876':
      manta: update kernel prebuilt -- DO NOT MERGE

commit 18d1fc74e7f7285e846fd645f03b5f3c0119f876
Merge: 06e4c3e d555bc0
Author: Ken Sumrall <ksumrall@android.com>
Date:   Mon Dec 10 18:16:35 2012 -0800

    am d555bc0b: manta: update kernel prebuilt -- DO NOT MERGE

    * commit 'd555bc0bab228a5276e2cf34910af6d8941940b8':
      manta: update kernel prebuilt -- DO NOT MERGE

commit d555bc0bab228a5276e2cf34910af6d8941940b8
Author: Ken Sumrall <ksumrall@android.com>
Date:   Mon Dec 10 18:10:44 2012 -0800

    manta: update kernel prebuilt -- DO NOT MERGE

    77dc147 Revert "ARM: EXYNOS: Manta: Enable emmc 4.5 packed write support"
    fef2da4 Log when a device on a mmc bus is hw reset

    Change-Id: Id291efa2aab62be2e4263d0eda1d7b3560d25a07
    Signed-off-by: Ken Sumrall <ksumrall@android.com>

commit 78846101df798db98a25901a40b2741e599bac51
Merge: 4fedfda 9e69716
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Dec 7 07:54:42 2012 -0800

    am 9e69716c: (-s ours) Reconcile with jb-mr1.1-release - do not merge

    * commit '9e69716c9588124e924f1461e5a9f7db413157dc':

commit 9e69716c9588124e924f1461e5a9f7db413157dc
Merge: 3cc1a0b 21972ea
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Dec 7 07:52:53 2012 -0800

    Reconcile with jb-mr1.1-release - do not merge

    Change-Id: I3b63433ea886d050ec498150947460db89730aa4

commit 4fedfdaa44d451e228892be15825f2b9c60fd751
Merge: 6351c1a 3cc1a0b
Author: Dima Zavin <dima@android.com>
Date:   Thu Dec 6 23:23:40 2012 -0800

    am 3cc1a0b6: (-s ours) am 06e4c3e4: am 0410ef03: manta: update prebuilt -- DO NOT MERGE

    * commit '3cc1a0b64b9ae62ce18c4f886bbd2203408ed4cb':
      manta: update prebuilt -- DO NOT MERGE

commit 21972ea706f264ac699d98e1a539d027858bcade
Merge: 0410ef0 b85c39f
Author: The Android Automerger <android-build@android.com>
Date:   Thu Dec 6 19:35:56 2012 -0800

    merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

commit 3cc1a0b64b9ae62ce18c4f886bbd2203408ed4cb
Merge: 4d583b9 06e4c3e
Author: Dima Zavin <dima@android.com>
Date:   Thu Dec 6 19:00:29 2012 -0800

    am 06e4c3e4: am 0410ef03: manta: update prebuilt -- DO NOT MERGE

    * commit '06e4c3e48b0b9d7b92e019fd6d12647d1cdf6d6f':
      manta: update prebuilt -- DO NOT MERGE

commit 06e4c3e48b0b9d7b92e019fd6d12647d1cdf6d6f
Merge: 543c668 0410ef0
Author: Dima Zavin <dima@android.com>
Date:   Thu Dec 6 13:24:30 2012 -0800

    am 0410ef03: manta: update prebuilt -- DO NOT MERGE

    * commit '0410ef03bdf8a8ba40e156daf187477389f6b753':
      manta: update prebuilt -- DO NOT MERGE

commit 0410ef03bdf8a8ba40e156daf187477389f6b753
Author: Dima Zavin <dima@android.com>
Date:   Thu Dec 6 13:11:56 2012 -0800

    manta: update prebuilt -- DO NOT MERGE

    845f6e9 media: exynos: mfc: print some debug info in irq on invalid context

    Bug: 7261738
    Change-Id: I988055d5228585d961c4edc5df2e9ae164e30421
    Signed-off-by: Dima Zavin <dima@android.com>

commit 6351c1a4cfc17a04b9c75ac47ae1b103f5bfff5b
Merge: f16982d 4d583b9
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Dec 5 13:00:49 2012 -0800

    am 4d583b9a: (-s ours) Reconcile with jb-mr1.1-release - do not merge

    * commit '4d583b9a730dae5be94437cf00b6f51a81fa696d':

commit 4d583b9a730dae5be94437cf00b6f51a81fa696d
Merge: f50b8a6 b85c39f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Dec 5 11:08:47 2012 -0800

    Reconcile with jb-mr1.1-release - do not merge

    Change-Id: Icfa80b01b6ed3292a4df952780f25b7ac2c6c038

commit b85c39f713e8d44ee6e7ee976bc4627943934357
Merge: 6574c7c c1eb4cc
Author: The Android Automerger <android-build@android.com>
Date:   Tue Dec 4 19:58:35 2012 -0800

    merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

commit f16982d1436aa5da1c55d30003c801589e097b86
Merge: ea45e44 f50b8a6
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Dec 4 11:15:06 2012 -0800

    am f50b8a63: (-s ours) am 543c668f: am 6574c7ce: manta: update kernel prebuilt -- DO NOT MERGE

    * commit 'f50b8a634c67b5de4aface0b1a882fb6de392455':
      manta: update kernel prebuilt -- DO NOT MERGE

commit f50b8a634c67b5de4aface0b1a882fb6de392455
Merge: 64637f2 543c668
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Dec 4 11:13:21 2012 -0800

    am 543c668f: am 6574c7ce: manta: update kernel prebuilt -- DO NOT MERGE

    * commit '543c668fda6a6201b2a9e4529caa9508e4c13a10':
      manta: update kernel prebuilt -- DO NOT MERGE

commit 543c668fda6a6201b2a9e4529caa9508e4c13a10
Merge: 2e285f2 6574c7c
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Dec 4 11:11:28 2012 -0800

    am 6574c7ce: manta: update kernel prebuilt -- DO NOT MERGE

    * commit '6574c7ce0a27af4718dd93b36fdc96e0f364a015':
      manta: update kernel prebuilt -- DO NOT MERGE

commit 6574c7ce0a27af4718dd93b36fdc96e0f364a015
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Dec 4 10:59:46 2012 -0800

    manta: update kernel prebuilt -- DO NOT MERGE

    54ba5f8 gpu: ion: Fix bug in zeroing pages in system heap

    Change-Id: I8141d6ab192b8fc6cec81347d18e072274696967
    Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>

commit ea45e440b78da362331f96d7d1c6fd520107cbc3
Merge: bdf798f 64637f2
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Dec 3 16:00:09 2012 -0800

    am 64637f2b: (-s ours) Reconcile with jb-mr1.1-release - do not merge

    * commit '64637f2b886ca49a3bd417315535319d67dac30b':

commit 64637f2b886ca49a3bd417315535319d67dac30b
Merge: 6e046b2 c1eb4cc
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Dec 3 15:58:11 2012 -0800

    Reconcile with jb-mr1.1-release - do not merge

    Change-Id: Ibe93a628fbde6da07d3f14294efd8fa00afc1ade

commit c1eb4cced0c0959c32fbdf336e1a69d9827eb77e
Merge: ff10cea 0f7fd16
Author: The Android Automerger <android-build@android.com>
Date:   Mon Dec 3 15:54:16 2012 -0800

    merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

commit bdf798fc0b42a1fdd43d360cc4701335b64fa9b9
Merge: f9ad20b 6e046b2
Author: Ken Sumrall <ksumrall@android.com>
Date:   Mon Dec 3 12:36:44 2012 -0800

    am 6e046b24: (-s ours) am 2e285f22: am ff10ceaf: manta: update kernel prebuilt -- DO NOT MERGE

    * commit '6e046b248bdb7627fe3586add62a1fe79338b32d':
      manta: update kernel prebuilt -- DO NOT MERGE

commit 6e046b248bdb7627fe3586add62a1fe79338b32d
Merge: d7c03ad 2e285f2
Author: Ken Sumrall <ksumrall@android.com>
Date:   Mon Dec 3 12:33:46 2012 -0800

    am 2e285f22: am ff10ceaf: manta: update kernel prebuilt -- DO NOT MERGE

    * commit '2e285f22c3ea4e815b9899e21cabbdae081fe8ff':
      manta: update kernel prebuilt -- DO NOT MERGE

commit 2e285f22c3ea4e815b9899e21cabbdae081fe8ff
Merge: ebef246 ff10cea
Author: Ken Sumrall <ksumrall@android.com>
Date:   Mon Dec 3 12:32:01 2012 -0800

    am ff10ceaf: manta: update kernel prebuilt -- DO NOT MERGE

    * commit 'ff10ceafbf81078516690f1c856a960f79a4c24e':
      manta: update kernel prebuilt -- DO NOT MERGE

commit f9ad20b72ca4b8dfae70b6b6bdba84e6c44680eb
Merge: 7c6ff71 d7c03ad
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Dec 3 11:36:39 2012 -0800

    am d7c03ad3: (-s ours) Reconcile with jb-mr1.1-release - do not merge

    * commit 'd7c03ad349fc45f83fd793a7ad739ec606dc6dca':

commit d7c03ad349fc45f83fd793a7ad739ec606dc6dca
Merge: 1a72f15 0f7fd16
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Dec 3 11:34:10 2012 -0800

    Reconcile with jb-mr1.1-release - do not merge

    Change-Id: Ic7238c5bcbfa44badd0f6b472a468bb852294762

commit 0f7fd1608047278104010b00d67c233e2beb488b
Merge: 808b4f6 b6ec49f
Author: The Android Automerger <android-build@android.com>
Date:   Mon Dec 3 06:06:23 2012 -0800

    merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

commit ff10ceafbf81078516690f1c856a960f79a4c24e
Author: Ken Sumrall <ksumrall@android.com>
Date:   Fri Nov 30 19:54:03 2012 -0800

    manta: update kernel prebuilt -- DO NOT MERGE

    a70727f mmc: dw_mmc: fix to clear interrupt pending when exception

    Change-Id: I8a6ce429ea7cd05b58c988ea9e256133f3badf94

commit 7c6ff71683a9043ccf09de0bb9193f299a904247
Merge: 67bcc3d 1a72f15
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Nov 30 15:01:49 2012 -0800

    am 1a72f15f: (-s ours) Reconcile with jb-mr1.1-release - do not merge

    * commit '1a72f15f0351a3a18beac580ebf7e2cdec89a4db':
      manta: update prebuilt kernel

commit 1a72f15f0351a3a18beac580ebf7e2cdec89a4db
Merge: a10d2a0 b6ec49f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Nov 30 14:59:51 2012 -0800

    Reconcile with jb-mr1.1-release - do not merge

    Change-Id: I2a029d8a0b9b877126bc415da838cfd8bb14772e

commit b6ec49ff25f46a27c4707028a91e40bd4adf8aa3
Author: Dima Zavin <dima@android.com>
Date:   Fri Nov 30 12:24:45 2012 -0800

    manta: update prebuilt kernel

    fcdc650 media: exynos: mfc: fix ctx wake up of uninterruptible tasks

    Change-Id: I8006221e235f5e3e0e76a2f5491059be11a6d2c0
    Signed-off-by: Dima Zavin <dima@android.com>

commit 67bcc3d8feabc7fa120e10e984cfa8683b2466dc
Merge: c8e22fa a10d2a0
Author: Martijn Coenen <maco@google.com>
Date:   Fri Nov 30 13:25:46 2012 -0800

    am a10d2a06: am ebef2469: am 808b4f66: Merge "Manta: NFC: Set pre-poweroff timeout to 10ms." into jb-mr1.1-dev

    * commit 'a10d2a06eae347000b72268fc5b4d7f529f4e47d':
      Manta: NFC: Set pre-poweroff timeout to 10ms.

commit c8e22fa1c086ab262d25e395cc4d8528eebaa0e8
Merge: 4e0bdd0 d5b16ee
Author: Dima Zavin <dima@android.com>
Date:   Fri Nov 30 13:25:46 2012 -0800

    am d5b16eea: (-s ours) am 87e3a9d9: am 9caf75db: manta: update prebuilt kernel

    * commit 'd5b16eea665723f8e428ef52903857bf343ef1ce':
      manta: update prebuilt kernel

commit a10d2a06eae347000b72268fc5b4d7f529f4e47d
Merge: d5b16ee ebef246
Author: Martijn Coenen <maco@google.com>
Date:   Fri Nov 30 13:19:31 2012 -0800

    am ebef2469: am 808b4f66: Merge "Manta: NFC: Set pre-poweroff timeout to 10ms." into jb-mr1.1-dev

    * commit 'ebef2469ce46861a9ee836436e4f43d585bb6f2c':
      Manta: NFC: Set pre-poweroff timeout to 10ms.

commit d5b16eea665723f8e428ef52903857bf343ef1ce
Merge: dc31e50 87e3a9d
Author: Dima Zavin <dima@android.com>
Date:   Fri Nov 30 13:19:30 2012 -0800

    am 87e3a9d9: am 9caf75db: manta: update prebuilt kernel

    * commit '87e3a9d966d3e5e37a1be5a6209e901eb3a9e725':
      manta: update prebuilt kernel

commit ebef2469ce46861a9ee836436e4f43d585bb6f2c
Merge: 87e3a9d 808b4f6
Author: Martijn Coenen <maco@google.com>
Date:   Fri Nov 30 13:17:16 2012 -0800

    am 808b4f66: Merge "Manta: NFC: Set pre-poweroff timeout to 10ms." into jb-mr1.1-dev

    * commit '808b4f6605ff0320fe463de602ec768b5a699da8':
      Manta: NFC: Set pre-poweroff timeout to 10ms.

commit 87e3a9d966d3e5e37a1be5a6209e901eb3a9e725
Merge: b656a75 9caf75d
Author: Dima Zavin <dima@android.com>
Date:   Fri Nov 30 13:16:50 2012 -0800

    am 9caf75db: manta: update prebuilt kernel

    * commit '9caf75db675d3df4e2884b8fc1cdb69389ca0814':
      manta: update prebuilt kernel

commit 808b4f6605ff0320fe463de602ec768b5a699da8
Merge: 9caf75d e650109
Author: Martijn Coenen <maco@google.com>
Date:   Fri Nov 30 12:56:22 2012 -0800

    Merge "Manta: NFC: Set pre-poweroff timeout to 10ms." into jb-mr1.1-dev

commit 9caf75db675d3df4e2884b8fc1cdb69389ca0814
Author: Dima Zavin <dima@android.com>
Date:   Fri Nov 30 12:24:45 2012 -0800

    manta: update prebuilt kernel

    fcdc650 media: exynos: mfc: fix ctx wake up of uninterruptible tasks

    Change-Id: I8006221e235f5e3e0e76a2f5491059be11a6d2c0
    Signed-off-by: Dima Zavin <dima@android.com>

commit 4e0bdd09980a9115ac2bb84c6bd4f4b4113fdbfc
Merge: c2f5b0f b8af714
Author: Andreas Huber <andih@google.com>
Date:   Fri Nov 30 10:40:50 2012 -0800

    Merge "Enable wifi display source functionality on manta."

commit b8af7147058d9049445bd30a92192a61f846cd2d
Author: Andreas Huber <andih@google.com>
Date:   Fri Nov 30 09:33:53 2012 -0800

    Enable wifi display source functionality on manta.

    Change-Id: Ib8feed584aef2415d18ca7efca755f1a41f18e1d

commit c2f5b0f757e9eb10294f5bf358d243ef16d6eb44
Merge: a3d4214 dc31e50
Author: Eric Laurent <elaurent@google.com>
Date:   Fri Nov 30 08:24:24 2012 -0800

    am dc31e500: am b656a754: am 67758f78: Merge "audio: adjust flat level detection threshold" into jb-mr1.1-dev

    * commit 'dc31e50087b1f2a6574b8048e54c43b5930a7845':
      audio: adjust flat level detection threshold

commit dc31e50087b1f2a6574b8048e54c43b5930a7845
Merge: 316f7fa b656a75
Author: Eric Laurent <elaurent@google.com>
Date:   Fri Nov 30 08:21:54 2012 -0800

    am b656a754: am 67758f78: Merge "audio: adjust flat level detection threshold" into jb-mr1.1-dev

    * commit 'b656a7545630102370629930c171c9b275af14e9':
      audio: adjust flat level detection threshold

commit b656a7545630102370629930c171c9b275af14e9
Merge: b04df59 67758f7
Author: Eric Laurent <elaurent@google.com>
Date:   Fri Nov 30 08:18:54 2012 -0800

    am 67758f78: Merge "audio: adjust flat level detection threshold" into jb-mr1.1-dev

    * commit '67758f78824f1b915f50c47d326083c5d11fce51':
      audio: adjust flat level detection threshold

commit 67758f78824f1b915f50c47d326083c5d11fce51
Merge: 8298b94 4634eff
Author: Eric Laurent <elaurent@google.com>
Date:   Fri Nov 30 08:17:09 2012 -0800

    Merge "audio: adjust flat level detection threshold" into jb-mr1.1-dev

commit a3d4214bedc323268f25e5c154f76ac959a60b1a
Merge: 7dc81da 316f7fa
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 29 15:38:02 2012 -0800

    am 316f7fa9: am b04df590: am 8298b941: Merge "Revert "make wfd work on manta"" into jb-mr1.1-dev

    * commit '316f7fa96c32fa2e02f7c3f6b380d45397e3dc27':
      Revert "make wfd work on manta"

commit 316f7fa96c32fa2e02f7c3f6b380d45397e3dc27
Merge: e41d14e b04df59
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 29 15:36:29 2012 -0800

    am b04df590: am 8298b941: Merge "Revert "make wfd work on manta"" into jb-mr1.1-dev

    * commit 'b04df5900dec736608661aeb1771efebfec1330f':
      Revert "make wfd work on manta"

commit b04df5900dec736608661aeb1771efebfec1330f
Merge: f14a8c6 8298b94
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 29 15:34:50 2012 -0800

    am 8298b941: Merge "Revert "make wfd work on manta"" into jb-mr1.1-dev

    * commit '8298b9419b5cd9614752d52a998d2e446cf456b0':
      Revert "make wfd work on manta"

commit 8298b9419b5cd9614752d52a998d2e446cf456b0
Merge: 76707dc 3fb8dd6
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 29 15:33:45 2012 -0800

    Merge "Revert "make wfd work on manta"" into jb-mr1.1-dev

commit 7dc81da35249988fcd4e572b4126d3122e8df2b1
Merge: f8ee93a e41d14e
Author: Benoit Goby <benoit@android.com>
Date:   Thu Nov 29 14:36:48 2012 -0800

    am e41d14e2: (-s ours) am f14a8c66: am 76707dcb: manta: update kernel prebuilt -- DO NOT MERGE

    * commit 'e41d14e2e7c337ccc09e4513265c235c94053a15':
      manta: update kernel prebuilt -- DO NOT MERGE

commit e41d14e2e7c337ccc09e4513265c235c94053a15
Merge: c52c89c f14a8c6
Author: Benoit Goby <benoit@android.com>
Date:   Thu Nov 29 14:26:40 2012 -0800

    am f14a8c66: am 76707dcb: manta: update kernel prebuilt -- DO NOT MERGE

    * commit 'f14a8c662ba4ae2fcf796cd6e7767745a78f8c26':
      manta: update kernel prebuilt -- DO NOT MERGE

commit 9eb493187c306ce816837013e803249062ccdf3c
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Nov 29 09:28:05 2012 -0800

    Generate fixed JOP40C factory images

    Change-Id: I57067f904b270609a2d33af65c254bab819666b4

commit f14a8c662ba4ae2fcf796cd6e7767745a78f8c26
Merge: 41f1829 76707dc
Author: Benoit Goby <benoit@android.com>
Date:   Wed Nov 28 18:33:44 2012 -0800

    am 76707dcb: manta: update kernel prebuilt -- DO NOT MERGE

    * commit '76707dcb2883c84cc391fdf535f396d2401b0811':
      manta: update kernel prebuilt -- DO NOT MERGE

commit 4634eff8b42842e7fb5bc135f434567381c481c0
Author: Eric Laurent <elaurent@google.com>
Date:   Wed Nov 28 17:48:51 2012 -0800

    audio: adjust flat level detection threshold

    Current BubbleLevel implementation switches between desktop mode
    and non desktop mode indication at an andgle of approximately 6 degrees.

    Relax this to 12 degrees to avoid false detections: it is better to be in
    1 mic mode if not necessary than in 2 mic mode if not applicable.

    Bug 7634268.

    Change-Id: I698682966559f86136566688265b9823e53e5adf

commit 76707dcb2883c84cc391fdf535f396d2401b0811
Author: Benoit Goby <benoit@android.com>
Date:   Wed Nov 28 17:38:52 2012 -0800

    manta: update kernel prebuilt -- DO NOT MERGE

    bc129e7 media: exynos-tv: add to clear interrupt after changing to HDMI internal interrupt

    Bug: 7368925
    Change-Id: I23e816bcfcad9325a4c963415e680c7793e80433

commit 3fb8dd696156e38425f6780c112efb3b952fc46e
Author: Andreas Huber <andih@google.com>
Date:   Wed Nov 28 14:41:18 2012 -0800

    Revert "make wfd work on manta"

    This reverts commit afb4524656774563a041fa5839ca4e3bddba91c7.

commit e904f14b4f2a6092cff8a21243d15b63e9b681e8
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Nov 28 14:10:32 2012 -0800

    JOP40D factory images for Manta

    Change-Id: I0da3c71cd6e156f7357b89e3921ef43c9ec4539f

commit f8ee93afd5b063a547a9d1f9c0f3cd6389d4b33e
Merge: 40397af c52c89c
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Nov 28 10:23:41 2012 -0800

    am c52c89c1: Merge from AOSP

    * commit 'c52c89c17ddac05c91ba155706e34fbe7a65c140':
      Updated Manta self-extractors for JOP40C
      License/Copyright for Audience
      Manta factory images for JOP40C
      Manta self-extractors for JOP40C

commit c52c89c17ddac05c91ba155706e34fbe7a65c140
Merge: de2d6fe 6e7d185
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Nov 28 10:05:05 2012 -0800

    Merge from AOSP

    Change-Id: Ic3462854158565ac9865bd6b4c7d55d2db236198

commit 40397af4969f4542bd5c3624a59e8b47c9799947
Merge: 590c217 de2d6fe
Author: Ken Sumrall <ksumrall@android.com>
Date:   Tue Nov 27 22:42:25 2012 -0800

    am de2d6fe8: (-s ours) am 41f1829a: am 05a616eb: manta: update kernel prebuilt -- DO NOT MERGE

    * commit 'de2d6fe876bf0a7f5b795fc6745bd0bfd0cfd100':
      manta: update kernel prebuilt -- DO NOT MERGE

commit de2d6fe876bf0a7f5b795fc6745bd0bfd0cfd100
Merge: 64eed68 41f1829
Author: Ken Sumrall <ksumrall@android.com>
Date:   Tue Nov 27 22:41:29 2012 -0800

    am 41f1829a: am 05a616eb: manta: update kernel prebuilt -- DO NOT MERGE

    * commit '41f1829ad21ab1a2ea0b5b93063c5d71fc98904a':
      manta: update kernel prebuilt -- DO NOT MERGE

commit 41f1829ad21ab1a2ea0b5b93063c5d71fc98904a
Merge: 73def42 05a616e
Author: Ken Sumrall <ksumrall@android.com>
Date:   Tue Nov 27 22:40:05 2012 -0800

    am 05a616eb: manta: update kernel prebuilt -- DO NOT MERGE

    * commit '05a616eba02df4d23db15c1401b3e23c51042495':
      manta: update kernel prebuilt -- DO NOT MERGE

commit 05a616eba02df4d23db15c1401b3e23c51042495
Author: Ken Sumrall <ksumrall@android.com>
Date:   Tue Nov 27 20:58:37 2012 -0800

    manta: update kernel prebuilt -- DO NOT MERGE

    86038e9 mmc: dw_mmc: add to clear HLE interrupt

    Bug: 7595944
    Change-Id: Ief79160348100a6c42a57164bd666c5d25fa224c

commit 590c217b886c5b01e52650bf7be7f71a397cfd0f
Merge: fdc4a8d 64eed68
Author: Dima Zavin <dima@android.com>
Date:   Tue Nov 27 18:43:36 2012 -0800

    am 64eed68a: (-s ours) am 73def426: am 560b269e: manta: update kernel prebuilt -- DO NOT MERGE

    * commit '64eed68a47845acf76686ed1318cdf1e96363ec8':
      manta: update kernel prebuilt -- DO NOT MERGE

commit 64eed68a47845acf76686ed1318cdf1e96363ec8
Merge: f2c7220 73def42
Author: Dima Zavin <dima@android.com>
Date:   Tue Nov 27 15:20:12 2012 -0800

    am 73def426: am 560b269e: manta: update kernel prebuilt -- DO NOT MERGE

    * commit '73def426b60926ea754952aba087ab5c950f0f3c':
      manta: update kernel prebuilt -- DO NOT MERGE

commit 73def426b60926ea754952aba087ab5c950f0f3c
Merge: a5fcb15 560b269
Author: Dima Zavin <dima@android.com>
Date:   Tue Nov 27 15:18:01 2012 -0800

    am 560b269e: manta: update kernel prebuilt -- DO NOT MERGE

    * commit '560b269ea1a75517bacc237436fe50a0683db553':
      manta: update kernel prebuilt -- DO NOT MERGE

commit 560b269ea1a75517bacc237436fe50a0683db553
Author: Dima Zavin <dima@android.com>
Date:   Tue Nov 27 11:06:29 2012 -0800

    manta: update kernel prebuilt -- DO NOT MERGE

    379eac0 media: exynos: mfc: get rid of interruptible dev/ctx wait_events
    4313eb3 media: exynos: mfc: do not release firmware buffer when drm is enabled
    0c26cd1 media: exynos: s5p-mfc: prevent suspend while MFC is in use

    Bug: 7261738
    Change-Id: Iba9711126c14ebd605e3b885e5e6b5af807b0218
    Signed-off-by: Dima Zavin <dima@android.com>

commit e650109ebbc2639a13db2229289df813e3295e15
Author: Martijn Coenen <maco@google.com>
Date:   Mon Nov 26 11:22:54 2012 -0800

    Manta: NFC: Set pre-poweroff timeout to 10ms.

    This gives the SE a chance to finish any ongoing
    transaction, to prevent any bricking.

    Bug: 7612176
    Change-Id: I00d946d7b8784dd8bf4f048b0a8b43c1ff30f205

commit fdc4a8df4ca8daaf6be23e22406b7ad6a6d7ee58
Merge: 3f062eb f2c7220
Author: Colin Cross <ccross@android.com>
Date:   Mon Nov 26 09:39:18 2012 -0800

    am f2c7220e: am a5fcb15d: am d028ef2d: manta: add /d/kbase_carveout to dumpstate

    * commit 'f2c7220e1abe3b61c740b1cd95c9e6e5dafaf0e4':
      manta: add /d/kbase_carveout to dumpstate

commit 3f062eb1b635a56df1829f6929774db0cd3ae619
Merge: 19768d2 cb63fa5
Author: Colin Cross <ccross@android.com>
Date:   Mon Nov 26 09:39:17 2012 -0800

    am cb63fa56: (-s ours) am 9553805e: am 1d6a1e84: manta: update kernel prebuilt DO NOT MERGE

    * commit 'cb63fa565034f7709746c42d8e8edccf9ec4ac49':
      manta: update kernel prebuilt DO NOT MERGE

commit f2c7220e1abe3b61c740b1cd95c9e6e5dafaf0e4
Merge: cb63fa5 a5fcb15
Author: Colin Cross <ccross@android.com>
Date:   Mon Nov 26 09:37:36 2012 -0800

    am a5fcb15d: am d028ef2d: manta: add /d/kbase_carveout to dumpstate

    * commit 'a5fcb15dd6acfbb971de4d3a2595932d41552e57':
      manta: add /d/kbase_carveout to dumpstate

commit cb63fa565034f7709746c42d8e8edccf9ec4ac49
Merge: 4e0ce78 9553805
Author: Colin Cross <ccross@android.com>
Date:   Mon Nov 26 09:37:34 2012 -0800

    am 9553805e: am 1d6a1e84: manta: update kernel prebuilt DO NOT MERGE

    * commit '9553805e8d99040d5b99919bfaa7e9533249d32a':
      manta: update kernel prebuilt DO NOT MERGE

commit a5fcb15dd6acfbb971de4d3a2595932d41552e57
Merge: 9553805 d028ef2
Author: Colin Cross <ccross@android.com>
Date:   Mon Nov 26 09:35:09 2012 -0800

    am d028ef2d: manta: add /d/kbase_carveout to dumpstate

    * commit 'd028ef2d20b4673afb8c32ad787414911b56c7ef':
      manta: add /d/kbase_carveout to dumpstate

commit 9553805e8d99040d5b99919bfaa7e9533249d32a
Merge: a431cf8 1d6a1e8
Author: Colin Cross <ccross@android.com>
Date:   Mon Nov 26 09:35:08 2012 -0800

    am 1d6a1e84: manta: update kernel prebuilt DO NOT MERGE

    * commit '1d6a1e848e5fbbb3fff6b120de473d53f474f4b3':
      manta: update kernel prebuilt DO NOT MERGE

commit d028ef2d20b4673afb8c32ad787414911b56c7ef
Author: Colin Cross <ccross@android.com>
Date:   Wed Nov 21 14:25:18 2012 -0800

    manta: add /d/kbase_carveout to dumpstate

    Add /d/kbase_carveout to show how many pages have been allocated
    by the gpu out of the carveout or system memory.

    Change-Id: I2aa58e812a8d50c9505180ef52f579512445df0f

commit 1d6a1e848e5fbbb3fff6b120de473d53f474f4b3
Author: Colin Cross <ccross@android.com>
Date:   Wed Nov 21 14:22:53 2012 -0800

    manta: update kernel prebuilt DO NOT MERGE

    054c776 ARM: exynos: manta: reserve 384MB for mali driver
    970a9b5 gpu: mali: add a carveout for gpu memory
    988246b gpu: mali: get rid of kbase_page_metadata
    e78e3a9 mali: mark kbase_pm workqueue WQ_MEM_RECLAIM
    d1f9052 s3c-fb: add register dump to debugfs

    Bug: 7572971
    Bug: 7557179
    Bug: 7460863
    Change-Id: I35c221f9fbd742686f373572c5d4b50992c76978

commit 19768d26cdfd569bc5a53ad6767534236ccf5f17
Merge: a3c9669 4e0ce78
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Fri Nov 16 10:38:12 2012 -0800

    am 4e0ce785: (-s ours) am a431cf85: am 5ff54e56: manta: kernel prebuilt (DO NOT MERGE)

    * commit '4e0ce785fdc77ea96cdf5c7fc1ca56ae931e0ae8':
      manta: kernel prebuilt (DO NOT MERGE)

commit a3c96693fb770fc1f620fff8f55bed51353e8982
Merge: 6128aa9 3ccb979
Author: Marco Nelissen <marcone@google.com>
Date:   Fri Nov 16 09:21:15 2012 -0800

    Merge "Add gsm decoder to media codec list"

commit 3ccb979f23458add8a38137670101c5d8ba6bad0
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Nov 15 16:33:20 2012 -0800

    Add gsm decoder to media codec list

    b/6620569

    Change-Id: I5b1ff83be5f6da8c5e6b933d44ec56997f615c4b

commit 6128aa9cae1eac2f9fb2cc00872ad902390685ec
Author: Ken Sumrall <ksumrall@android.com>
Date:   Thu Nov 15 13:31:33 2012 -0800

    manta: kernel prebuilt

    a8bc720 ARM: exynos: manta: Enable seccomp in the kernel
    fc89270 CHROMIUM: ARM: r1->r0 for get/set arguments
    4132221 CHROMIUM: seccomp: set -ENOSYS if there is no tracer
    07d8e8a CHROMIUM: ARM: arch/arm: allow a scno of -1 to not cause a SIGILL
    d435e7c CHROMIUM: arch/arm: select HAVE_ARCH_SECCOMP_FILTER
    3ac8e25 CHROMIUM: arch/arm: move secure_computing into trace; respect return code
    850c3fd CHROMIUM: arch/arm: add asm/syscall.h
    81184d37 samples/seccomp: fix dependencies on arch macros
    08fa604 seccomp: fix build warnings when there is no CONFIG_SECCOMP_FILTER
    59a58da seccomp: ignore secure_computing return values
    1ad58c9 seccomp: use a static inline for a function stub
    edb7e37 Documentation: prctl/seccomp_filter
    1d6fe76 Change-Id: I7c9d49079d4e18390c2d520513a4afd55e6eaa3e
    dfd7a3c ptrace,seccomp: Add PTRACE_SECCOMP support
    e250bdc seccomp: Add SECCOMP_RET_TRAP
    83fb062 signal, x86: add SIGSYS info and make it synchronous.
    ed303bc seccomp: add SECCOMP_RET_ERRNO
    bc76490 seccomp: remove duplicated failure logging
    d1ae630 seccomp: add system call filtering using BPF
    a4cdeb5 arch/x86: add syscall_get_arch to syscall.h
    b31d760 asm/syscall.h: add syscall_get_arch
    00d8f75 seccomp: kill the seccomp_t typedef
    9a9070e net/compat.c,linux/filter.h: share compat_sock_fprog
    08c1c15 sk_run_filter: add BPF_S_ANC_SECCOMP_LD_W
    a51a083 Fix execve behavior apparmor for PR_{GET,SET}_NO_NEW_PRIVS
    61fa4f5 Add PR_{GET,SET}_NO_NEW_PRIVS to prevent execve from granting privs
    98119a4 ARM: EXYNOS: manta: Enable DW_MMC_QUIRK_HW_RESET_PW
    28f1382 ARM: EXYNOS: manta: add h/w reset function for eMMC
    216737e ARM: EXYNOS: manta: modify eMMC's drive stregnth to LV4
    ed1468f Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
    2179b8e Revert "mmc: dw_mmc: add h/w reset for mmc card"
    6f21933 Revert "mmc: dw_mmc: add DW_MMC_QUIRK_HW_RESET_PW quirk"
    afd90f7 Revert "mmc: dw_mmc: remove wait_prvdata_complete bit setting"
    bd423b6 Revert "mmc: dw_mmc: fix to check data busy on request func by CMD13"
    15e3ba82 mmc: dw_mmc: fix to check data busy on request func by CMD13
    e3f4c8f mmc: dw_mmc: remove wait_prvdata_complete bit setting
    e562939 mmc: dw_mmc: add DW_MMC_QUIRK_HW_RESET_PW quirk
    d6e3a09 mmc: dw_mmc: add h/w reset for mmc card
    a0c3d3a mmc: dw_mmc: fix to check data busy on request func by CMD13
    2889ea4 mmc: dw_mmc: remove wait_prvdata_complete bit setting
    13cb45f mmc: dw_mmc: add DW_MMC_QUIRK_HW_RESET_PW quirk
    d4166df mmc: dw_mmc: add h/w reset for mmc card
    49500f3 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    44188d6 mali-t6xx: debug patch to trace "dep_item[0]" list abuse
    a01365c mali-t6xx: fix null pointer deref whn dumping MMU page tables

    Change-Id: I35937a9f94b744a643d914cd2177f41fde177c1f

commit 4e0ce785fdc77ea96cdf5c7fc1ca56ae931e0ae8
Merge: dfddbb7 a431cf8
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Thu Nov 15 12:58:31 2012 -0800

    am a431cf85: am 5ff54e56: manta: kernel prebuilt (DO NOT MERGE)

    * commit 'a431cf851cf952215de46199752f7902709cebff':
      manta: kernel prebuilt (DO NOT MERGE)

commit a431cf851cf952215de46199752f7902709cebff
Merge: 48912b9 5ff54e5
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Thu Nov 15 12:55:34 2012 -0800

    am 5ff54e56: manta: kernel prebuilt (DO NOT MERGE)

    * commit '5ff54e564bb435fd87a4afc1b9b179aa44c1bc01':
      manta: kernel prebuilt (DO NOT MERGE)

commit 5ff54e564bb435fd87a4afc1b9b179aa44c1bc01
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Thu Nov 15 12:49:18 2012 -0800

    manta: kernel prebuilt (DO NOT MERGE)

    95b1ed5 net: wireless: bcmdhd: Fix dhd_txcomplete() dead lock

    Bug: 7475970

    Change-Id: Ic2cdb42661651167c7c1dcce55382d036c585f93
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit 2f9ad443a926b3c7d12d502a0a70fad163ce0def
Merge: 1ebc609 dfddbb7
Author: Andreas Huber <andih@google.com>
Date:   Wed Nov 14 13:55:48 2012 -0800

    am dfddbb77: am 48912b93: am afb45246: make wfd work on manta

    * commit 'dfddbb77b6da506dd821dea91ea1bf141a57322d':
      make wfd work on manta

commit dfddbb77b6da506dd821dea91ea1bf141a57322d
Merge: 62c0199 48912b9
Author: Andreas Huber <andih@google.com>
Date:   Wed Nov 14 13:53:16 2012 -0800

    am 48912b93: am afb45246: make wfd work on manta

    * commit '48912b930373a168387590179ee3ab1855379517':
      make wfd work on manta

commit 48912b930373a168387590179ee3ab1855379517
Merge: ff3abf1 afb4524
Author: Andreas Huber <andih@google.com>
Date:   Wed Nov 14 13:51:15 2012 -0800

    am afb45246: make wfd work on manta

    * commit 'afb4524656774563a041fa5839ca4e3bddba91c7':
      make wfd work on manta

commit afb4524656774563a041fa5839ca4e3bddba91c7
Author: Andreas Huber <andih@google.com>
Date:   Tue Nov 6 09:42:06 2012 -0800

    make wfd work on manta

    Change-Id: I1d0970b2ea6190169c1c3d7003062d02359042cd

commit 1ebc609af89a78d714d82c6a87d8bb7495aa9067
Merge: d880027 62c0199
Author: Ken Sumrall <ksumrall@android.com>
Date:   Tue Nov 13 11:19:19 2012 -0800

    am 62c01998: (-s ours) am ff3abf19: am 6e923eb5: manta: kernel prebuilt

    * commit '62c01998990155b8278af340159cac70ed1af4c0':
      manta: kernel prebuilt

commit 62c01998990155b8278af340159cac70ed1af4c0
Merge: 14e5490 ff3abf1
Author: Ken Sumrall <ksumrall@android.com>
Date:   Tue Nov 13 10:33:48 2012 -0800

    am ff3abf19: am 6e923eb5: manta: kernel prebuilt

    * commit 'ff3abf19499b434b0f0d94e79bd3a9d81982c539':
      manta: kernel prebuilt

commit ff3abf19499b434b0f0d94e79bd3a9d81982c539
Merge: adcadd9 6e923eb
Author: Ken Sumrall <ksumrall@android.com>
Date:   Tue Nov 13 10:30:40 2012 -0800

    am 6e923eb5: manta: kernel prebuilt

    * commit '6e923eb5a84cbda8a9b60f245e3665daa990854a':
      manta: kernel prebuilt

commit 6e923eb5a84cbda8a9b60f245e3665daa990854a
Author: Ken Sumrall <ksumrall@android.com>
Date:   Mon Nov 12 23:29:22 2012 -0800

    manta: kernel prebuilt

    494ffb2 ARM: EXYNOS: manta: Enable DW_MMC_QUIRK_HW_RESET_PW
    e06b91b mmc: dw_mmc: fix to check data busy on request func by CMD13
    89f6653 mmc: dw_mmc: remove wait_prvdata_complete bit setting
    9bb1e2e mmc: dw_mmc: add DW_MMC_QUIRK_HW_RESET_PW quirk
    5472b60 ARM: EXYNOS: manta: add h/w reset function for eMMC
    c1fc7e3 mmc: dw_mmc: add h/w reset for mmc card
    f25e71f ARM: EXYNOS: manta: modify eMMC's drive stregnth to LV4
    1ecbb6a mali-t6xx: debug patch to trace "dep_item[0]" list abuse
    81e1c03 mali-t6xx: fix null pointer deref whn dumping MMU page tables

    Change-Id: I790281af2526badb24d1c6e6cc40bda57e20ab8f

commit d880027282ec902fbe38f794977e83e9541462a8
Merge: 32d613d 14e5490
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Nov 12 08:23:12 2012 -0800

    am 14e54909: Merge from AOSP

    * commit '14e5490903a9d8cb7c0783bd427b9f3c725baf5e':

commit 32d613df6a73f3298f8945f9d9caca70ab0bdeaa
Merge: b554afc 609758d
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Nov 12 08:13:28 2012 -0800

    am 609758d7: Merge from AOSP

    * commit '609758d79ff83e2e2987978300ce7c998e2ce6a0':
      Manta factory images for JOP40

commit b554afc2e0f733852b0d125d9434544c822bb1fd
Merge: 1cf7388 33ecace
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Nov 12 08:13:27 2012 -0800

    am 33ecace5: Manta self-extractors for JOP39B

    * commit '33ecace5ec4c4a1e2acd99e33732cf5eafd96bc6':
      Manta self-extractors for JOP39B

commit 1cf7388ecee5b87019764b802e8809385b41ad97
Merge: 225c05b 35887bb
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Nov 12 08:13:26 2012 -0800

    am 35887bb6: Merge "Manta factory images for JOP39B" into stage-aosp-master

    * commit '35887bb6aa74002028855b0ca632e978c63b683f':
      Manta factory images for JOP39B

commit 225c05bdf251fe4670da6a85de596b122d1a8743
Merge: 6308687 c65bc11
Author: Eric Laurent <elaurent@google.com>
Date:   Thu Nov 8 15:59:19 2012 -0800

    am c65bc11a: (-s ours) am adcadd92: am 23e77a8d: audio: fix accelerometer crash - DO NOT MERGE

    * commit 'c65bc11a7e538b4540ac1d593d876b849a09b8f0':
      audio: fix accelerometer crash - DO NOT MERGE

commit 63086877d70832187efa4df51469f0c5249f442e
Author: Todd Poynor <toddpoynor@google.com>
Date:   Thu Nov 8 00:11:53 2012 -0800

    manta: prebuilt kernel

    d39c0e1 Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
    b1b0081 Merge branch 'android-3.4' into android-exynos-3.4
    9b29a6d cpufreq: interactive: kick timer on idle exit past expiry
    0697ab5 cpufreq: interactive: use deferrable timer by default
    430d3d4 cpufreq: interactive: pin timers to associated CPU
    a5bba29 ARM: exynos: add irq_set_affinity function for the combiner
    1b8ab36 media: exynos-tv: add to clear interrupt after changing to HDMI internal interrupt
    48e524d net: wireless: bcmdhd: Update wireless stack pm mode
    073d5ee ARM: fiq_debugger: fix uninitialised spin_lock.
    9c424d9 ARM: fiq_debugger: lock between tty and console writes
    15e8c13 ARM: exynos: manta: Adjust wlan ON power delays on boot
    389986b net: wireless: bcmdhd: Avoid suspend on watchdog
    e11477a ARM: exynos: persistent_clock: Add initializing rtc with valid time
    05a8e3f media: exynos-tv: Change the fbm threshold and min_freq for int_bus.
    0f216d4 ARM: EXYNOS5: bts: Add the fbm threshold change for mixer
    6bb93da sync: add Documentation/sync.txt
    14cca66 ARM: exynos: manta: battery: APSD interface updates
    7167aee power: smb347: APSD interface updates
    940281e ARM: EXYNOS: USB: Reset OTG Link Phy-domain in exynos5_usb_phy20_exit
    289ee65 gud: mobicore: make fastcalls not spawn a new thread every time
    4d7350a ARM: exynos: manta: battery: Do not enumerate USB on unknown charge source
    e774462 power: power_supply: Add POWER_SUPPLY_PROP_CHARGER_DETECTION
    0cb4729 ARM: exynos: manta: battery: Only check Samsung charger if DCP detected
    faae7aa power: max17047: remove obsolete driver
    90e9acd power: bq24191: remove obsolete driver
    8bbd80d ARM: exynos: manta: defconfig: remove charger drivers for obsolete boards
    cd3cdf7 ARM: exynos: manta: battery: remove support for alpha and earlier h/w revs
    9065e02 ARM: exynos: manta: battery: remove vbus wakeup source
    03f458c ARM: exynos: manta: battery: remove retries for Samsung TA ADC check

    Change-Id: Id51b2f420e1412cd9d3301a0e26acad424759946

commit 29eda2a8502b60cd134ca47c0e33138123be8440
Merge: 16e2026 3073ca0
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Nov 8 06:31:50 2012 -0800

    am 3073ca01: (-s ours) am 9fa26b05: am af0ae048: Reconcile with jb-mr1-release - do not merge

    * commit '3073ca01fc4bc470b019bee53f2786f5228ac2e9':

commit 16e20262052808815ec5038eb2ba7187e91a66ed
Merge: 60f8f74 31a359d
Author: Paul Eastham <eastham@google.com>
Date:   Thu Nov 8 06:21:39 2012 -0800

    am 31a359d8: am 58112ccf: am 8f59d414: am e3f87004: manta: kernel prebuilt

    * commit '31a359d83c2bd46ef3831009a1796e1c76bfc256':
      manta: kernel prebuilt

commit 60f8f74a2e7cc7c424bd3f0601b7a00d14626a72
Merge: 252b664 429f24d
Author: Eric Laurent <elaurent@google.com>
Date:   Wed Nov 7 15:20:22 2012 -0800

    Merge "bubble level: protect against sensor init failure"

commit 429f24d4f04171baf0b8a6e69f15ee5dfcaf3ab7
Author: Eric Laurent <elaurent@google.com>
Date:   Fri Nov 2 14:37:38 2012 -0700

    bubble level: protect against sensor init failure

    In case of sensor manager initialization failure,
    the bubble level factory returns null, the poll thread loop is not started
    and API methods return errors.
    also check for sensor manager service availability before attempting to
    create a sensor manager instance.

    The audio HAL does not attempt to create the bubble level at creation time to
    avoid possible conflicts with system server starting but only when needed.

    Bug 7398856.

    Change-Id: If6b69d7343c0bbbb574a6484fbd3d50117d4d89d

commit 252b664149b0e30d668d318df295ee5b953d5d88
Merge: d610475 efaa84d
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:23:58 2012 -0800

    am efaa84d5: (-s ours) am fd563856: am 7949399a: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit 'efaa84d5a7d6c6572924e228a829775f7c484b2d':

commit d6104752c59fa93e6fdedcb74cbae606a091c355
Merge: 0404e77 117069a
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Nov 6 09:55:07 2012 -0800

    am 117069a3: Manta self-extractors for JOP36

    * commit '117069a36735bcdacfe623d7ef26410421ec5bd2':
      Manta self-extractors for JOP36

commit 0404e77a78ef258d18b01bddd39f559bcf397107
Merge: 78e21a7 5e2e04c
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Nov 5 07:58:17 2012 -0800

    am 5e2e04c9: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '5e2e04c944ce480e75c8c650f495f70ba5f510b5':
      manta: kernel prebuilt

commit 78e21a7fb288dd745ecd53bb4f47191f6636fe21
Merge: 16f8111 48c0c23
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 2 15:03:58 2012 -0700

    am 48c0c236: Merge "Update manta self-extractors for JOB32B" into jb-mr1-dev-plus-aosp

    * commit '48c0c236306b4ddd12ca586919d69eb2933bdca1':
      Update manta self-extractors for JOB32B

commit 16f81115fa0811d11b33a3986a78aeadbe7daf34
Merge: f5afff5 acf28b5
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Fri Nov 2 11:33:29 2012 -0700

    am acf28b50: am 6d749fe0: am 58e151e2: manta: kernel prebuilt

    * commit 'acf28b501dbdfe82a54e25032fae573577d2c7db':
      manta: kernel prebuilt

commit f5afff5ffe66412f1dc839fa888cd3e7696e133e
Merge: 4735989 50535ff
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 2 09:56:25 2012 -0700

    am 50535fff: Mantaray factory images for JOP32B

    * commit '50535fff8b548fe70880516a895db0ca3c063427':
      Mantaray factory images for JOP32B

commit 47359893354ffa8a394155d73225de01f2ce5e8c
Merge: 53bd246 9815d6b
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 31 09:19:10 2012 -0700

    am 9815d6bb: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit '9815d6bb3f73d2af707a55b2bf45bbe0b88c8549':
      Disable multi-user for factory rom
      manta: update kernel prebuilt
      manta: prebuilt kernel (other AC charger detection)
      manta: prebuilt kernel for factoryrom: Always test for Samsung TA on USB connector
      take 9a1e666f3b1bf0a8a0f5ad2576e696283e4287b4
      new kernel prebuilt
      manta: update prebuilt kernel for FACTORY ROM
      manta: wifi.on use average power including sleep mode
      Add missing 32kHz rate in list of supported sample rates.

commit 53bd2467c7d135f8a393b8163c2dc21b3f7daada
Merge: 1b47887 7daeec7
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Tue Oct 30 17:41:37 2012 -0700

    am 7daeec7b: am 91481412: am 7286c4a5: manta: kernel prebuilt

    * commit '7daeec7b9ce4c334e9068376fa5f9479f8971c5b':
      manta: kernel prebuilt

commit 1b47887a0c6df647b72bc1917076ef8b5237d791
Merge: 2b505f8 7a3c229
Author: Matthew Xie <mattx@google.com>
Date:   Tue Oct 30 12:39:54 2012 -0700

    am 7a3c2293: am e441b87a: am ed195894: Merge "Change default bluetooth name to Nexus 10 for Manta" into jb-mr1-dev

    * commit '7a3c22931e90b6579be6c169dd54156915725554':
      Change default bluetooth name to Nexus 10 for Manta

commit 2b505f8df5bec4be9981ecd3415eb41393893048
Merge: 24cb4c5 b3dd8c9
Author: Jean-Michel Trivi <jmtrivi@google.com>
Date:   Tue Oct 30 10:15:37 2012 -0700

    am b3dd8c9d: am 1b469813: am b199d225: Merge "Don\'t change eS305 preset during a voice reco recording" into jb-mr1-dev

    * commit 'b3dd8c9d62f03b3d7c3035aa90853c8a30d597cc':
      Don't change eS305 preset during a voice reco recording

commit 24cb4c5c2a5c95526d7d5738c7f8aa3f6789001b
Merge: 455b5ca 5cec1bc
Author: Ken Sumrall <ksumrall@android.com>
Date:   Tue Oct 30 10:12:02 2012 -0700

    am 5cec1bc5: am 159dd807: am 8b2a1811: manta: update kernel prebuilt

    * commit '5cec1bc5c07844e6633d03142465f416ce7a688d':
      manta: update kernel prebuilt

commit 455b5caf3af79d619507c2389d22d7935e5bfd53
Merge: ce92b34 d3e1faa
Author: Colin Cross <ccross@android.com>
Date:   Tue Oct 30 10:11:13 2012 -0700

    am d3e1faa7: am 3df0c34a: am 3c63975b: manta: update kernel prebuilt

    * commit 'd3e1faa7fc18bfa0feb60ba0ea8e175fbed6b135':
      manta: update kernel prebuilt

commit ce92b34ddcb3adcfe5e1e7c541dabfff9aada878
Merge: 660bd02 4839ff3
Author: Jean-Michel Trivi <jmtrivi@google.com>
Date:   Mon Oct 29 17:15:42 2012 -0700

    am 4839ff3c: am b32be6ee: am d030e8cc: Merge "Correct effect configuration file for correct eS305 lib path" into jb-mr1-dev

    * commit '4839ff3c444c0bc059992f18d5aea2517fb3ab04':
      Correct effect configuration file for correct eS305 lib path

commit 660bd02b0ae2dfef1cddcbabea63fefde6c3a827
Merge: edd5915 fdb7671
Author: Simon Wilson <simonwilson@google.com>
Date:   Sat Oct 27 12:56:38 2012 -0700

    Merge "audio: initialise linked and value[0]"

commit edd5915e8f270f37e28ab41dc5ab21340b2ceb1b
Merge: 08c8b9f fe0db65
Author: Colin Cross <ccross@android.com>
Date:   Fri Oct 26 11:15:57 2012 -0700

    am fe0db657: am 3eef3adb: am e948c4e2: manta: update kernel prebuilt

    * commit 'fe0db657cac595da2842ae550082cc918e104f04':
      manta: update kernel prebuilt

commit 08c8b9f34ad02f6346731a73d8be4e41346fa76e
Merge: 38e3f1a df6d049
Author: Marco Nelissen <marcone@google.com>
Date:   Fri Oct 26 09:20:23 2012 -0700

    Merge "Switch to new fx library API"

commit 38e3f1af547eea4ea5064394a1a8edfc8d9a2842
Merge: a0d698d d1ba1fd
Author: Todd Poynor <toddpoynor@google.com>
Date:   Thu Oct 25 16:09:06 2012 -0700

    am d1ba1fd6: am f1a50a95: am 8b5468f1: manta: prebuilt kernel (other AC charger detection)

    * commit 'd1ba1fd673cae0ccbfb1e9500959f03cbaa96bb1':
      manta: prebuilt kernel (other AC charger detection)

commit df6d04926adf4c4a495ac0e71b5fc65a42b90489
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Oct 25 11:02:06 2012 -0700

    Switch to new fx library API

    Change-Id: I16ecda728e2371152db65fe2028c3b9b4e4163d4

commit a0d698de3d4a7fe2e058f473d1ec0570223c805e
Merge: 9362031 853a69a
Author: Colin Cross <ccross@android.com>
Date:   Wed Oct 24 17:00:13 2012 -0700

    am 853a69ad: am f4b9a242: am 3f29c5a8: manta: update prebuilt kernel

    * commit '853a69adac9fae71c0e90824f32c9cc14d4ecc5e':
      manta: update prebuilt kernel

commit fdb76710cc6d8ff8c9e6b5d648e4106a13a76a19
Author: Simon Wilson <simonwilson@google.com>
Date:   Wed Oct 24 16:17:28 2012 -0700

    audio: initialise linked and value[0]

    Change-Id: I63a1a467091ab5c25631eca05a7c072474a612b5

commit 9362031938f1431bef6fcf2e314acbe84e9d53f7
Merge: 67e63e7 4529286
Author: Erik Gilling <konkers@android.com>
Date:   Wed Oct 24 14:42:29 2012 -0700

    am 4529286a: am dc2c32bd: am 271a3dee: new kernel prebuilt

    * commit '4529286ad648d6413e8dcf2bb27d678bd3de11a2':
      new kernel prebuilt

commit 67e63e75bee5933d561023b0bb7a5009e0962923
Merge: 1b9be45 0ac22a5
Author: Jean-Michel Trivi <jmtrivi@google.com>
Date:   Tue Oct 23 23:03:51 2012 -0700

    am 0ac22a5a: am e04c5701: am aa7376d7: Merge "eS305 noise suppression level depends on preset" into jb-mr1-dev

    * commit '0ac22a5a43dd0ab083486c703a84ca83644af081':
      eS305 noise suppression level depends on preset

commit 1b9be4599e74e52ee7cb300b571593eeed1c0079
Merge: 4f4aba1 ba00e57
Author: Eric Laurent <elaurent@google.com>
Date:   Tue Oct 23 21:44:44 2012 -0700

    am ba00e579: am 49c5ae5f: am 5d3d6bec: Merge "bubble level: fix accelerometer not disabled" into jb-mr1-dev

    * commit 'ba00e579398bd9c1b0aef3192bc1ee6acd149d87':
      bubble level: fix accelerometer not disabled

commit 4f4aba16bb8d5e3527057bb3a8ae49fdfdb1828a
Merge: 1660efb 7a40af4
Author: Todd Poynor <toddpoynor@google.com>
Date:   Tue Oct 23 21:37:46 2012 -0700

    am 7a40af4f: am 59f88c0e: am 505dd92b: manta: prebuilt kernel

    * commit '7a40af4f4f254cbaf64411edff6a8b01faa7df4d':
      manta: prebuilt kernel

commit 1660efb43f3606b5b2aa91f208e0d35df2ffbc28
Merge: 6c30790 07c5407
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Oct 23 17:30:04 2012 -0700

    am 07c54079: am 00a05b27: am 4a78e6a4: New kernel prebuilt

    * commit '07c54079c17603ffb70ced55fe3a10d705eef669':
      New kernel prebuilt

commit 6c3079057782725cd6fa236cc96353823f366b14
Merge: f9471e3 ef7fda7
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Tue Oct 23 14:05:31 2012 -0700

    am ef7fda73: am 3d176d2a: am 8c1b4d0e: manta: kernel prebuilt

    * commit 'ef7fda734c24b24460b5c1b8e32e538b7083f8ae':
      manta: kernel prebuilt

commit f9471e31aef39361196372ab3f3e5201ecb9be4f
Merge: 2b287c4 ba969a0
Author: Simon Wilson <simonwilson@google.com>
Date:   Mon Oct 22 13:59:37 2012 -0700

    am ba969a0a: am 979eabb2: am 79a2e01c: audio: don\'t reset mixer paths at standby

    * commit 'ba969a0a1010ebfe0340c9b56dbb89b061c1f906':
      audio: don't reset mixer paths at standby

commit 2b287c4665956638f11050f2373c562717d6d046
Merge: c71cafa ba192bd
Author: Simon Wilson <simonwilson@google.com>
Date:   Mon Oct 22 11:37:11 2012 -0700

    am ba192bd2: am 1e4e3632: am 105d84d6: New kernel prebuilt

    * commit 'ba192bd2b6612e4610e7abdfdd89061b1f1d85ca':
      New kernel prebuilt

commit c71cafaa4440e4e4f81b401a29cfc047dca0fb30
Merge: b3585f3 298e91c
Author: Jean-Michel Trivi <jmtrivi@google.com>
Date:   Mon Oct 22 10:33:25 2012 -0700

    am 298e91c1: am 3215bf06: am e04f7c99: Control eS305 voice processing effects

    * commit '298e91c1e815849448ad419478da29b733e3d1e2':
      Control eS305 voice processing effects

commit b3585f39e3cf2df22063e1897b0061cf8d3f9f32
Merge: 2cc26aa eecc502
Author: Todd Poynor <toddpoynor@google.com>
Date:   Sat Oct 20 11:09:35 2012 -0700

    am eecc5028: am 65b68545: am 5772b919: manta: prebuilt kernel (other-ac charger detect on pogo)

    * commit 'eecc50284bc9a9dff409cf21a04789682445d1aa':
      manta: prebuilt kernel (other-ac charger detect on pogo)

commit 2cc26aae79af57d168a32946b8343e6e778e4f59
Merge: 387ae0c ad2060c
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Fri Oct 19 15:03:45 2012 -0700

    am ad2060c8: am 8858c2bc: am 9d9a6743: Merge "New kernel prebuilt" into jb-mr1-dev

    * commit 'ad2060c87379c09957192631f96bf3d81ade90ce':
      New kernel prebuilt

commit 387ae0cffb8e6a58eda0364686982d4fb5d53163
Merge: a0d4271 5636f57
Author: Colin Cross <ccross@android.com>
Date:   Fri Oct 19 14:53:01 2012 -0700

    am 5636f570: am b63b73df: am 3a15c646: manta: increase memory reserves

    * commit '5636f57027e13027b5efb1b16cffbf218f6771f2':
      manta: increase memory reserves

commit a0d4271821cd98af26d465b20ab39a28fef33ec3
Merge: 129f8e5 2f39f56
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Fri Oct 19 13:22:43 2012 -0700

    am 2f39f566: am 374be20a: am 09d4559b: manta: update prebuilt kernel

    * commit '2f39f5664c6166d661cc9cbcc92e1c9896e396c4':
      manta: update prebuilt kernel

commit 129f8e5fc81ba53b842bff22b6c9aaf289879959
Merge: 5b2f166 af5593b
Author: Eric Laurent <elaurent@google.com>
Date:   Fri Oct 19 13:22:23 2012 -0700

    am af5593bb: am c4daa9f8: am a989ebf7: audio: select es305 preset according to level

    * commit 'af5593bb8cb766370fa2855c8c32880355dec4ae':
      audio: select es305 preset according to level

commit 5b2f166954833a4f28f3c565016a5a9d6455804c
Merge: 595c8dd 34219cc
Author: Erik Gilling <konkers@android.com>
Date:   Thu Oct 18 23:56:51 2012 -0700

    am 34219cc5: am b48c15ce: am e1a91fcc: set ro.hwui.disable_scissor_opt=true in device.mk

    * commit '34219cc5dadb5580200400b008779359c5e6ec38':
      set ro.hwui.disable_scissor_opt=true in device.mk

commit 595c8ddf666bd67b6c5c5cc82a8ff712dc29a168
Merge: 7f46cba d2d5149
Author: Benoit Goby <benoit@android.com>
Date:   Thu Oct 18 22:45:04 2012 -0700

    am d2d5149a: am 902e29b3: am 9ab7235d: manta: update prebuilt kernel

    * commit 'd2d5149aba54bc75178f117867302b38dd030ece':
      manta: update prebuilt kernel

commit 7f46cba06ca04d5161bb4219cdb47a395647ad53
Merge: 77e27d0 687ebc5
Author: Benoit Goby <benoit@android.com>
Date:   Thu Oct 18 22:45:03 2012 -0700

    am 687ebc50: am a194a5f8: am 97db95b9: dumpstate: Add HDMI register dump

    * commit '687ebc500aa311443aca60337ea32055303890cc':
      dumpstate: Add HDMI register dump

commit 77e27d0d93e503562bab664844f96b6ec10bfba5
Merge: 384b39c 76587e4
Author: Glenn Kasten <gkasten@google.com>
Date:   Thu Oct 18 17:31:03 2012 -0700

    am 76587e4b: am 366dad69: am 0ff6b675: Report feature "android.hardware.audio.low_latency"

    * commit '76587e4bf0b41e572b02c5e1ce056260dfb7a3ce':
      Report feature "android.hardware.audio.low_latency"

commit 384b39c527d3fe7ef33a65514a35df12e3f896fc
Merge: 844ea38 0cc63a1
Author: Jeff Hamilton <jham@android.com>
Date:   Thu Oct 18 12:52:23 2012 -0700

    am 0cc63a15: am 2ee12359: am 4be53b17: Merge "Remove the Google specific location config." into jb-mr1-dev

    * commit '0cc63a158437c3ab377ad768caa14f01eee2be72':
      Remove the Google specific location config.

commit 844ea38caea3b98bae2765cf09d36e53fe361bf2
Merge: 0a15110 71d50d3
Author: Eric Laurent <elaurent@google.com>
Date:   Thu Oct 18 12:23:30 2012 -0700

    am 71d50d39: am 6d4dc814: am 34fdc3de: Merge "audio: remove TODOs in mixer_paths.xml" into jb-mr1-dev

    * commit '71d50d390569ef3b6abecf422e48143cbff897d9':
      audio: remove TODOs in mixer_paths.xml

commit 0a15110a9eca00cf3997b58f60f619b1611cfbfe
Merge: 4c299f5 79753c2
Author: Dima Zavin <dima@android.com>
Date:   Thu Oct 18 00:15:16 2012 -0700

    am 79753c21: am 0571137f: am ea0a7189: manta: update prebuilt kernel

    * commit '79753c2100f4c23b6f147c986541ec22cb881b1f':
      manta: update prebuilt kernel

commit 4c299f5bcdab9137a4e5de4c9e0d90821a10bf64
Merge: 0cc3945 f65a9b2
Author: Martijn Coenen <maco@google.com>
Date:   Wed Oct 17 20:55:48 2012 -0700

    am f65a9b20: am 68738528: am 39ca4e1d: Merge "Manta: NFC: Re-enable Listen-F active." into jb-mr1-dev

    * commit 'f65a9b20d1400d349b25b923b89c008427b344a6':
      Manta: NFC: Re-enable Listen-F active.

commit 0cc39454c3710723adcf2ec144fa88b6fe13212d
Merge: 0eab4a6 0031ed9
Author: Colin Cross <ccross@android.com>
Date:   Wed Oct 17 19:20:46 2012 -0700

    am 0031ed92: am 209ecbd5: am d272fe70: manta: update kernel prebuilt

    * commit '0031ed92a96aa5fdefc8469b42238cdf47be1e0f':
      manta: update kernel prebuilt

commit 0eab4a66a0d5c7849471d4c9d18e8d7946718e69
Merge: b8120a8 9a87bfb
Author: Eric Laurent <elaurent@google.com>
Date:   Wed Oct 17 18:10:26 2012 -0700

    am 9a87bfb2: am 20b6ccc3: am 9829f98f: Merge "Add library to monitor the tablet orientation" into jb-mr1-dev

    * commit '9a87bfb2268b1472f8f87e96ae5883e69df7c85b':
      Add library to monitor the tablet orientation

commit b8120a8c4bc9fc8bc716d165589efff5d957229f
Merge: e3cd85a dddf781
Author: Simon Wilson <simonwilson@google.com>
Date:   Wed Oct 17 13:53:20 2012 -0700

    am dddf781b: am b58985eb: am 5a9015a7: new kernel prebuilt

    * commit 'dddf781bc74a79d86f56555147f5ffdee437656e':
      new kernel prebuilt

commit e3cd85a895ae38fd28fb6af367e8277a49750593
Merge: 4b6436c 92012b4
Author: Benoit Goby <benoit@android.com>
Date:   Tue Oct 16 18:14:17 2012 -0700

    am 92012b43: am 563b643e: am 562b6c3d: new kernel prebuilt

    * commit '92012b43887da3a4b7499b64e2ed0c13e62ee989':
      new kernel prebuilt

commit 4b6436c6ca4ee1ad2ba33f7de915f44cccb62f3d
Merge: 1cdbb1c 9794136
Author: iamyouna.lee <iamyouna.lee@samsung.com>
Date:   Tue Oct 16 16:48:53 2012 -0700

    am 97941367: am 142a69e0: am 9a324454: manta: Update nvram for wifi

    * commit '97941367866f86baeba86a302398a53bc892aa4e':
      manta: Update nvram for wifi

commit 1cdbb1c3c6bf9fa3914bce909cdccd4e7be8caf4
Merge: 176c5f5 9f60878
Author: Paul Eastham <eastham@google.com>
Date:   Tue Oct 16 16:32:51 2012 -0700

    am 9f60878e: am 57d8d682: am 1ad5a8dd: New manta kernel

    * commit '9f60878e20d48f32424dbb2c19e5306b03283d14':
      New manta kernel

commit 176c5f5cd53ce1df9efa80afda2f04c9b8234931
Merge: 40ed893 aa2d92c
Author: Erik Gilling <konkers@android.com>
Date:   Tue Oct 16 13:28:08 2012 -0700

    am aa2d92c9: am bd22af60: am 5ff870c4: new kernel prebuilt

    * commit 'aa2d92c9ae0e154dd5f6d1d48ef999e835bd00b7':
      new kernel prebuilt

commit 40ed893009371fc264087fd04fc71fa783b1fcee
Merge: c81c002 e131f46
Author: Jean-Michel Trivi <jmtrivi@google.com>
Date:   Tue Oct 16 09:24:58 2012 -0700

    am e131f46c: am 062a3220: am 27572d82: Merge "Don\'t use eS305 for speech recognition" into jb-mr1-dev

    * commit 'e131f46c2f613547833f2e17a5a550268cda274b':
      Don't use eS305 for speech recognition

commit c81c0021265b0c106ffa496b0ce8c439a95b1cbb
Merge: 6efdea4 a20bb1a
Author: Erik Gilling <konkers@android.com>
Date:   Mon Oct 15 20:22:05 2012 -0700

    am a20bb1a1: am ea1f5a4a: am 3c9c52fa: new kernel prebuilt

    * commit 'a20bb1a1a46d5f98c5f26dbf446ae9ea77375bbe':
      new kernel prebuilt

commit 6efdea4ac74c7c547a27902c89f942ea640f1ab3
Merge: cfabd8f bc9fcc1
Author: James Dong <jdong@google.com>
Date:   Mon Oct 15 20:22:04 2012 -0700

    am bc9fcc1c: am 43b7c44c: am 73632440: Merge "Added missing audio encoder capabilities" into jb-mr1-dev

    * commit 'bc9fcc1cc68988f099e85c59a0c4cda97d5538f3':
      Added missing audio encoder capabilities

commit cfabd8ff9bd827672e81dbdc69ada26e8458944c
Merge: 0c1d51e 3650f4a
Author: Dima Zavin <dima@android.com>
Date:   Mon Oct 15 20:22:04 2012 -0700

    am 3650f4a1: am 6ed39bb9: am 39944fba: manta: update kernel prebuilt

    * commit '3650f4a12fa2d85375416206c88f93f5b27db501':
      manta: update kernel prebuilt

commit 0c1d51e684ce32340d7802546880863b21873308
Merge: 389b0bd ae8777d
Author: Todd Poynor <toddpoynor@google.com>
Date:   Mon Oct 15 15:27:18 2012 -0700

    am ae8777d3: am 24cb5cb8: am 1d5d3ebe: Merge "manta: wifi.on use average power including sleep mode" into jb-mr1-dev

    * commit 'ae8777d33bd6eeabf516b827baa4862cf58090d4':
      manta: wifi.on use average power including sleep mode

commit 389b0bdca0100b11583965e6369295c2d37158b7
Merge: a394bd1 1788f36
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Mon Oct 15 13:45:04 2012 -0700

    am 1788f367: am 81bfb11d: am 6f185095: Merge "manta: wlan: Turn ON FW watchdog to catch FW hang" into jb-mr1-dev

    * commit '1788f36778b627166ec8a5507dc799530ea71911':
      manta: wlan: Turn ON FW watchdog to catch FW hang

commit a394bd13f4874e192c61b5852a383682cc62faff
Merge: 3ea3a59 6470857
Author: Jean-Michel Trivi <jmtrivi@google.com>
Date:   Mon Oct 15 11:29:42 2012 -0700

    am 64708575: am baaefe43: am 1b7c663e: Merge "Add missing 32kHz rate in list of supported sample rates." into jb-mr1-dev

    * commit '64708575b9f649b2959f4acfcedd8a4baf3ec683':
      Add missing 32kHz rate in list of supported sample rates.

commit 3ea3a59d46ba82cd7c5c8c3ad0fc8ff38430b38c
Merge: 4d9b0bb 7d31522
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Oct 15 07:40:26 2012 -0700

    am 7d31522c: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit '7d31522c20abff08114eb2bdf5a3a5c2ed305572':

commit 4d9b0bb9342fe9556b2603256de9e4b48bf5d985
Merge: afbbe68 30b751c
Author: Dima Zavin <dima@android.com>
Date:   Fri Oct 12 15:57:24 2012 -0700

    am 30b751c4: am 8ee52c06: am 67c64ca6: manta: charger: do not blank display on startup

    * commit '30b751c444c0e4e352c427678ca038f405bc678c':
      manta: charger: do not blank display on startup

commit afbbe6806e020e133b8b416a2e3c051bbe108803
Merge: 0e428dd a86560c
Author: Dima Zavin <dima@android.com>
Date:   Fri Oct 12 15:54:16 2012 -0700

    am a86560ca: am 8e6867d0: am cf701105: manta: update kernel prebuilt

    * commit 'a86560caf997bf4c5e72cd021f9f6b5ec3c50192':
      manta: update kernel prebuilt

commit 0e428ddb37bc8d47e80ae87408e0bf1b8ab6b47a
Merge: bceb474 8e5461d
Author: Jamie Gennis <jgennis@google.com>
Date:   Fri Oct 12 14:39:53 2012 -0700

    am 8e5461db: am 4119e72d: am 73336e60: Merge "Triple buffer SurfaceFlinger" into jb-mr1-dev

    * commit '8e5461db7643f5cfaf6330f394a1c83c3d0d4abc':
      Triple buffer SurfaceFlinger

commit bceb47465756780cdf15b219c9a2031fd52f576b
Merge: 883f40e 760a30b
Author: Benoit Goby <benoit@android.com>
Date:   Fri Oct 12 11:17:28 2012 -0700

    am 760a30b1: am 5bcfe782: am 0f06a457: manta: update kernel prebuilt

    * commit '760a30b1915b99692c7227c6be2c40467d7ee633':
      manta: update kernel prebuilt

commit 883f40e9ad977a4260813d8f7a433333ab48bc5b
Merge: 3d87296 87f5763
Author: Dima Zavin <dima@android.com>
Date:   Fri Oct 12 11:06:57 2012 -0700

    am 87f5763e: am 17d4b237: am b4732d95: manta: update kernel prebuilt

    * commit '87f5763e4f03df9e47ea0ab3bf9c195fe92a9cc8':
      manta: update kernel prebuilt

commit 3d87296e1360122b4ff85ea8d75e3f85b5620a43
Merge: 5f41df5 d7ad3f1
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Fri Oct 12 11:06:57 2012 -0700

    am d7ad3f1b: am e88124a6: am 0c6e7789: New kernel prebuilt

    * commit 'd7ad3f1bbb534f2414929fddce0cc1b7eeaac63f':
      New kernel prebuilt

commit 5f41df5a54363020f60468558424bcc07417fee8
Merge: 8aa8cec 81aebea
Author: Martijn Coenen <maco@google.com>
Date:   Thu Oct 11 17:54:27 2012 -0700

    am 81aebea6: am 781ac30b: am 0154998c: Manta: NFC: Re-enable RF field events.

    * commit '81aebea6764672ca36d01723abe0ebd7e0e9ba3b':
      Manta: NFC: Re-enable RF field events.

commit 8aa8cec7ccc45f8389e8bf82c31f9787b454abfe
Merge: 3c609c8 ad19570
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Oct 11 08:06:29 2012 -0700

    am ad195708: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'ad195708c3bd7e19bc2ca9ead0b7fa18039e59f7':

commit 3c609c8e56e2f68ea29d67a89bb9edd0bb347586
Merge: f259d6e 1c043d7
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Oct 11 05:59:13 2012 -0700

    am 1c043d75: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '1c043d75574d3b4dc36c03a6d68b6ec1bc52982f':
      new kernel prebuilt
      New kernel prebuilt

commit f259d6e389146a49641d410de504414e9ec6cf53
Merge: bf5d89f f9de762
Author: Colin Cross <ccross@android.com>
Date:   Wed Oct 10 22:29:33 2012 -0700

    am f9de7621: am efcebe0c: am c47682b7: manta: update kernel prebuilt

    * commit 'f9de7621a18b780f3d865014ea38bf8a272406ba':
      manta: update kernel prebuilt

commit bf5d89f5ec23b3a1c8a36e6f88ecd9ce0f5d6a1a
Merge: 2c1af47 777a12b
Author: Erik Gilling <konkers@android.com>
Date:   Wed Oct 10 18:57:16 2012 -0700

    am 777a12b0: am 1544d522: am 5061f181: new kernel prebuilt

    * commit '777a12b0f39648e9f84e3635e2f3fe6c40cdf868':
      new kernel prebuilt

commit 2c1af47879de8e71a3404e56be3963270eec75a7
Merge: 2fd22df c6cb49b
Author: Todd Poynor <toddpoynor@google.com>
Date:   Wed Oct 10 18:33:06 2012 -0700

    am c6cb49b1: am b2c3ee83: am 6ea11693: dumpstate: dump dock status

    * commit 'c6cb49b1100e0be91c436abf51939cf265f38a45':
      dumpstate: dump dock status

commit 2fd22df3e127b868d29e81528246638a5f9e3793
Merge: 865f773 c82e419
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Oct 10 17:22:46 2012 -0700

    am c82e4197: am 3b96976f: am 8fb9c14f: New kernel prebuilt

    * commit 'c82e4197a718920bc4eb10ac190b082beab3b705':
      New kernel prebuilt

commit 865f773c90b45e1f7c5715daf2ffcdc3ff9afd39
Merge: ce05f59 c41b205
Author: JP Abgrall <jpa@google.com>
Date:   Wed Oct 10 13:09:28 2012 -0700

    am c41b205c: am 8c971a8a: am 229295e7: Merge "overlay: config: Lower Dim brightness." into jb-mr1-dev

    * commit 'c41b205c8ed2b9c8ea2a5bb119d8b8afee2ac2ee':
      overlay: config: Lower Dim brightness.

commit ce05f599cb13cbd829098b3203161b002b2bf1ac
Merge: d058260 820cbad
Author: Erik Gilling <konkers@android.com>
Date:   Wed Oct 10 13:04:33 2012 -0700

    am 820cbadc: am fa0068ef: am ea0ac268: new kernel prebuilt

    * commit '820cbadce9801e99d774b6ec5eb63c639a032d9c':
      new kernel prebuilt

commit d058260c8b3d0e066677b4be912cd3ab8edb5c2f
Merge: 1196daf aa92cdf
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 10 09:47:51 2012 -0700

    am aa92cdfd: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit 'aa92cdfd2c2b76b84f548ac0d876bb57c3983ea3':
      update prebuilt kernel
      New kernel
      overlay: config: revert min brightness brightness in the lowest range.

commit 1196daf808078cddc33f981c490495eb494964c0
Merge: d1321d8 7240f37
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Oct 10 09:24:04 2012 -0700

    am 7240f37d: am 865aaa63: am e7a9f88d: Merge "auto-generated blob list" into jb-mr1-dev

    * commit '7240f37dffc20f279e532739faa1f73246d7fc65':
      auto-generated blob list

commit d1321d88d5033188607abb9f8eda5efa34600bb0
Merge: 19c8b4b 7230090
Author: Colin Cross <ccross@android.com>
Date:   Wed Oct 10 08:37:50 2012 -0700

    am 72300900: am 9e7d6117: am 4a6e1659: Merge "manta: update kernel prebuilt" into jb-mr1-dev

    * commit '72300900dbcd3df56fdcc89d83802fc9dcf47f18':
      manta: update kernel prebuilt

commit 19c8b4b3ad4172c0456507873aa0ca4fc9c2106f
Merge: e59cf35 f41924b
Author: Martijn Coenen <maco@google.com>
Date:   Tue Oct 9 20:15:03 2012 -0700

    am f41924b0: am e8e497ed: am 204d27bf: Merge "Manta: NFC: Clean up configuration." into jb-mr1-dev

    * commit 'f41924b0afd548dc09e73d4c638d0ffb91b479a6':
      Manta: NFC: Clean up configuration.

commit e59cf356c5304dc6144739e36489f131c6b1e077
Merge: 8fb8232 e8c4f2a
Author: Simon Wilson <simonwilson@google.com>
Date:   Tue Oct 9 14:38:41 2012 -0700

    am e8c4f2ab: am c39d19ee: am 59f6277b: update prebuilt kernel

    * commit 'e8c4f2abbb80b3510742ec9d0f0a85301fa62288':
      update prebuilt kernel

commit 8fb8232931be8ddb5e8c5e61d510cf5916152020
Merge: 3d50e5b 26a0ac3
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Oct 9 12:03:14 2012 -0700

    am 26a0ac3e: am 6db1d81c: am fc0329c2: New kernel

    * commit '26a0ac3ed0fa57e44e3a8780a51f071216f4eea9':
      New kernel

commit 3d50e5b639f5ce0f0baa891aa65b1ac99785bfc9
Merge: 5a1bee2 5bc9d3c
Author: JP Abgrall <jpa@google.com>
Date:   Tue Oct 9 09:02:26 2012 -0700

    am 5bc9d3ca: am 3ad8725d: am 3de71ca4: overlay: config: revert min brightness brightness in the lowest range.

    * commit '5bc9d3caeb00f8847f6e0c186d550076325e3a7c':
      overlay: config: revert min brightness brightness in the lowest range.

commit 5a1bee2cdbc4b91f6334e36a8a89cbb8d9d40cc6
Merge: a363e88 7c099e1
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 9 07:29:53 2012 -0700

    am 7c099e1a: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '7c099e1a3c932d4f6c8fce39eb3cc784dc0b293d':
      update prebuilt kernel
      overlay: config: raise brightness in the lower range.
      manta: update prebuilt kernel
      new kernel prebuilt
      Adjust the min and max frame rate settings for camcorder apps
      new kernel prebuilt
      Add shrinker debug file to manta dumpstate
      New prebuilt kernel

commit a363e88ec807057094a77f950af6a751179d7e02
Merge: 113f51b b747fd8
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Oct 9 05:52:28 2012 -0700

    am b747fd8f: am dbd5dd5b: auto-generated blob list

    * commit 'b747fd8ffe484e22c84ca3bdb5a479f7f50df254':
      auto-generated blob list

commit 113f51bca864a470f26ae11b2669643b06b967ac
Merge: cbe0968 816845a
Author: Simon Wilson <simonwilson@google.com>
Date:   Mon Oct 8 16:48:43 2012 -0700

    am 816845a7: am cbe680d5: update prebuilt kernel

    * commit '816845a7d1ab75f214db4a9c78cad49c8b318ab3':
      update prebuilt kernel

commit cbe09681ca5605d7129accbbff858fd74eabde41
Merge: 74774e8 0522803
Author: JP Abgrall <jpa@google.com>
Date:   Mon Oct 8 16:23:09 2012 -0700

    am 05228032: am b0ce9816: overlay: config: raise brightness in the lower range.

    * commit '05228032129f1b9cff34c092514c776d07b83003':
      overlay: config: raise brightness in the lower range.

commit 74774e8ce8df3319a12338d0432109f9ddbb7b4a
Merge: a04aad7 e9258c8
Author: Ken Sumrall <ksumrall@android.com>
Date:   Mon Oct 8 16:22:24 2012 -0700

    am e9258c86: am 52648fbd: manta: update prebuilt kernel

    * commit 'e9258c868538a9f7b90ce7e354b2866420828d19':
      manta: update prebuilt kernel

commit a04aad792a8b5cb0502135cc62fff5e88638d4f0
Merge: e572d97 82099d7
Author: Ken Sumrall <ksumrall@android.com>
Date:   Mon Oct 8 16:21:53 2012 -0700

    am 82099d7d: am 83ca947d: Merge "Add userdata images for 32 GB and 64 GB manta variants." into jb-mr1-dev

    * commit '82099d7da4d42607ff7358213ea29874740cda5c':
      Add userdata images for 32 GB and 64 GB manta variants.

commit e572d97eebf0a968d8e62ce2b023186ebc6c33f3
Merge: bc45288 b0154f0
Author: Jean-Michel Trivi <jmtrivi@google.com>
Date:   Mon Oct 8 12:11:47 2012 -0700

    am b0154f0f: am 48277c57: Remove workaround for no audio in camcorder videos

    * commit 'b0154f0f8345150025cf302f3d84b9de2fabd1e1':
      Remove workaround for no audio in camcorder videos

commit bc4528884cef55447f2eef22d43f40172d40330e
Merge: c1a87f0 e949ad5
Author: Colin Cross <ccross@android.com>
Date:   Sun Oct 7 13:54:42 2012 -0700

    am e949ad54: am a2fa9409: manta: update prebuilt kernel

    * commit 'e949ad547d6585a73de792204380d2ff47d8f55f':
      manta: update prebuilt kernel

commit c1a87f09d14747ff2844d841d2f9608dbaed67eb
Merge: 9bcc16c 26b93df
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Sun Oct 7 13:33:19 2012 -0700

    am 26b93dff: am 869a1c98: Merge "manta: kernel prebuilt" into jb-mr1-dev

    * commit '26b93dffa3d3205f739907679837a6ea93eb35a6':
      manta: kernel prebuilt

commit 9bcc16cb2069b682c637580fc9b5e79089ec2364
Merge: 767b9c7 d2079dc
Author: Jean-Michel Trivi <jmtrivi@google.com>
Date:   Sun Oct 7 13:07:11 2012 -0700

    am d2079dc6: am a39a56ca: Merge "Workaround for no audio in camcorder" into jb-mr1-dev

    * commit 'd2079dc698de4ea17788b99df8c62867211470b7':
      Workaround for no audio in camcorder

commit 767b9c7f3981a5fd0a07ba8e4a9846f2e6d2ef9d
Merge: 00264f1 a666f67
Author: JP Abgrall <jpa@google.com>
Date:   Sun Oct 7 10:49:40 2012 -0700

    am a666f677: am e005ba34: overlay: config: raise brightness in the middle, way lower in pitch black

    * commit 'a666f6772b97c5d35c57e8bdfe718667e1088a84':
      overlay: config: raise brightness in the middle, way lower in pitch black

commit 00264f13dcb020cb80a6ef6e62d3a181f4d0d539
Merge: 95c9426 d2f5e82
Author: Erik Gilling <konkers@android.com>
Date:   Fri Oct 5 16:52:23 2012 -0700

    am d2f5e829: am 0bb5422b: new kernel prebuilt

    * commit 'd2f5e8294b5a0b82ead6aca2cc3882ef39f0eae3':
      new kernel prebuilt

commit 95c942692ba9fd9e135319c6ef6d8463def1a9ca
Merge: a0962c7 352f411
Author: Alex Ray <aray@google.com>
Date:   Fri Oct 5 16:38:23 2012 -0700

    am 352f4118: am 24c53230: Adjust the min and max frame rate settings for camcorder apps

    * commit '352f4118ad72b4010af2cf97889b0ec4b4d6f64e':
      Adjust the min and max frame rate settings for camcorder apps

commit a0962c7a5d52f0ec377d113b3ec90aa22442c07b
Merge: 04b4a18 415aaf9
Author: Rebecca Zavin <rebecca@android.com>
Date:   Fri Oct 5 14:54:41 2012 -0700

    am 415aaf9c: am 76ad53eb: Merge "new kernel prebuilt" into jb-mr1-dev

    * commit '415aaf9c6ded010ccfed165b5ffc4816e37a0f32':
      new kernel prebuilt

commit 04b4a180804205dc9b167ba9cea94a5624734ca7
Merge: 9f41835 edc9d34
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Fri Oct 5 14:52:54 2012 -0700

    am edc9d34f: am bacf4fc4: Add shrinker debug file to manta dumpstate

    * commit 'edc9d34f7f8524a25ff952178feb72b618f3b3fc':
      Add shrinker debug file to manta dumpstate

commit 9f41835b238b9036c90d9a3ee76906bbd9b24643
Merge: 0e610ce 6842eb9
Author: Simon Wilson <simonwilson@google.com>
Date:   Fri Oct 5 13:35:15 2012 -0700

    am 6842eb9e: am 88b6a510: New prebuilt kernel

    * commit '6842eb9e270fa98d171a59872a760f7c05678643':
      New prebuilt kernel

commit 0e610cec6fc6149ddf91fcfa97ee7fa31004905b
Merge: 2d7c453 3346597
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Oct 5 08:18:20 2012 -0700

    am 3346597e: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '3346597ef8330a72ea538dbb93e08952248e9f5f':
      New prebuilt kernel
      eS305 sleep when not used
      Add ion debug info to dumpstate
      New prebuilt kernel

commit 2d7c453336a6810ef62925fda617a7dbb5f86d5e
Merge: 8ff30d5 6310c7d
Author: Jeff Hamilton <jham@android.com>
Date:   Fri Oct 5 00:52:26 2012 -0700

    am 6310c7df: am a023813e: Revert "Remove the Google specific location config."

    * commit '6310c7dfbd44e8306b8ed5a906fe2f695c560764':
      Revert "Remove the Google specific location config."

commit 8ff30d5e6cfdd8d96fb6da8a1211d19e771ec317
Merge: 65b970d 5db9733
Author: Matthew Xie <mattx@google.com>
Date:   Thu Oct 4 23:34:25 2012 -0700

    am 5db9733a: am 7f32e6f3: Change Bluetooth file group id to net_bt_stack for manta

    * commit '5db9733a52a25a0f515d1b7f92ca034ce18a52d1':
      Change Bluetooth file group id to net_bt_stack for manta

commit 65b970d5849f794bdec0338bc877bd21b18b5479
Merge: c824bd0 f734f6a
Author: Jeff Hamilton <jham@android.com>
Date:   Thu Oct 4 19:34:12 2012 -0700

    am f734f6a1: am 18b622ff: Merge "Remove the Google specific location config." into jb-mr1-dev

    * commit 'f734f6a1d966a6fb24e63a7ff1349733d8d7dfec':
      Remove the Google specific location config.

commit c824bd009b420cd67abb9127a373a7e92f9de561
Merge: d105fa5 e3494bb
Author: Simon Wilson <simonwilson@google.com>
Date:   Thu Oct 4 17:12:57 2012 -0700

    am e3494bb6: am 645290f7: Merge "New prebuilt kernel" into jb-mr1-dev

    * commit 'e3494bb6817e294ad706ebb0bd71d29494c11bc6':
      New prebuilt kernel

commit d105fa5bba48cce3840c81ff43f38b859eae5eaf
Merge: 2e7e261 72609f0
Author: Jean-Michel Trivi <jmtrivi@google.com>
Date:   Thu Oct 4 17:09:25 2012 -0700

    am 72609f0d: am 0427d432: eS305 sleep when not used

    * commit '72609f0de349baf7e028882736c187af11f490c2':
      eS305 sleep when not used

commit 2e7e2612b7524e9dff6fe896004050594291dc63
Merge: 73999cf a7a6632
Author: Martijn Coenen <maco@google.com>
Date:   Thu Oct 4 16:03:58 2012 -0700

    am a7a6632b: am e62c43e7: Merge "Manta: NFC: Don\'t generate RF field notification events." into jb-mr1-dev

    * commit 'a7a6632b0d7c6e5b8f9652d9a000a6fbe52322e8':
      Manta: NFC: Don't generate RF field notification events.

commit 73999cf7f3cc5bb4575e4aa35719d2784282c9f6
Merge: 6f5b7c2 dd42b4d
Author: JP Abgrall <jpa@google.com>
Date:   Thu Oct 4 14:56:58 2012 -0700

    am dd42b4d5: am 719c87ef: Merge "libsensors: Make it work with the Invensense MA 5.1.1" into jb-mr1-dev

    * commit 'dd42b4d5735e52fb28799e5a97042689538ad73b':
      libsensors: Make it work with the Invensense MA 5.1.1

commit 6f5b7c24896cc2262c166cc219fab660a4b60a72
Merge: ab0bd0f e54915c
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Thu Oct 4 13:23:56 2012 -0700

    am e54915c3: am 3a74fd45: Merge "Add ion debug info to dumpstate" into jb-mr1-dev

    * commit 'e54915c345cf9d04fc49aa0c239173c2b4dcbc0d':
      Add ion debug info to dumpstate

commit ab0bd0f9c30bfe27cd573a3ff3f28bf417eb2c33
Merge: 940b8e4 bc80b4d
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Oct 4 07:49:44 2012 -0700

    am bc80b4de: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'bc80b4de8f755d8295f8c277d2220f4f06cea210':
      take 3b1eb8ca0bcdf434863311c15c432c9032ac42c8
      take 789aa2af11c52464aa42b576a23d7cd34cfd8235

commit 940b8e49281923bae0c69daefc2d087779f45679
Merge: fa57c42 c61cd2f
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Thu Oct 4 06:57:31 2012 -0700

    am c61cd2f3: am 3dd60d11: New prebuilt kernel

    * commit 'c61cd2f3ed4d5a5766263dc70c8cbba4a2916a4b':
      New prebuilt kernel

commit fa57c4205abdd876191c5184168ee920d5e7c9ad
Merge: 117d1bd d150ef3
Author: Todd Poynor <toddpoynor@google.com>
Date:   Wed Oct 3 18:28:38 2012 -0700

    am d150ef35: am 4203d6ed: manta: prebuilt kernel (wifi scan, jack, bts, governor)

    * commit 'd150ef35cb93b5ec9074893119de7d12154abab5':
      manta: prebuilt kernel (wifi scan, jack, bts, governor)

commit 117d1bd85a95b89ddfec7082a39d2d96ae8bf3a1
Merge: 48416ab 0dac9ca
Author: Todd Poynor <toddpoynor@google.com>
Date:   Wed Oct 3 18:28:37 2012 -0700

    am 0dac9ca7: am 6ccb6abe: manta: power: cpufreq interactive governor params update

    * commit '0dac9ca7eff05dec8ce2b68a0359ed0507eb0d55':
      manta: power: cpufreq interactive governor params update

commit 48416ab8694995b5de4e5a68aa131da21b4ed0cb
Merge: 623ed92 0987847
Author: Eric Laurent <elaurent@google.com>
Date:   Wed Oct 3 17:22:27 2012 -0700

    am 09878473: am 121f9aa1: Merge "audio: fix headset mic capture" into jb-mr1-dev

    * commit '09878473530077a4288acc570c6b14c426da27a9':
      audio: fix headset mic capture

commit 623ed927f53bd70cf46913a63521dd860e03d132
Merge: bdc1474 272c936
Author: Erik Gilling <konkers@android.com>
Date:   Wed Oct 3 15:21:15 2012 -0700

    am 272c936e: am 3b1eb8ca: new kernel prebuilt

    * commit '272c936e9b5acc2d059c1329847e6fd5364db55f':
      new kernel prebuilt

commit bdc14745e7f696a9dbc48217e4d9c05b815d1115
Merge: 33bb101 da77901
Author: Simon Wilson <simonwilson@google.com>
Date:   Wed Oct 3 14:16:05 2012 -0700

    am da779010: am 789aa2af: manta: update kernel prebuilt

    * commit 'da7790103d27bec322a359a95132908bfc508837':
      manta: update kernel prebuilt

commit 33bb101f0a6cf3a5a1e4e1b2e820b3b663f55669
Merge: 4880930 49f7aff
Author: Benoit Goby <benoit@android.com>
Date:   Wed Oct 3 14:02:44 2012 -0700

    am 49f7affa: am 37bbb622: manta: update kernel prebuilt

    * commit '49f7affac1fcafc26e39a24c9034c48f2695c711':
      manta: update kernel prebuilt

commit 48809309a47eb33434585496d36ca2015a9b6887
Merge: 001c760 124e692
Author: Eric Laurent <elaurent@google.com>
Date:   Wed Oct 3 11:32:32 2012 -0700

    am 124e6926: am 2e5bbb4f: Merge "audio: added support for multichannel over HDMI" into jb-mr1-dev

    * commit '124e6926281afb89f1489334d023426e71003c86':
      audio: added support for multichannel over HDMI

commit 001c760e03155082f9d1a3890f0b90e2281bc747
Merge: 3770534 4d74c4f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 3 07:34:41 2012 -0700

    am 4d74c4fb: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '4d74c4fb7e7786bb9aaf6c1939078f340723ef2f':

commit 3770534fa2736507a698854e3453b78db7bab593
Merge: 07f611d e613b0a
Author: Colin Cross <ccross@android.com>
Date:   Wed Oct 3 00:34:13 2012 -0700

    am e613b0ad: am 178b743c: manta: update kernel prebuilt

    * commit 'e613b0ad18237df080b9b73b5e9ca7fe842ba0cb':
      manta: update kernel prebuilt

commit 07f611d1bc22d36f4f4d613fc21d2e5140fbc762
Merge: 9cc3348 3f30d15
Author: Jeff Brown <jeffbrown@google.com>
Date:   Tue Oct 2 19:55:32 2012 -0700

    am 3f30d153: am 66718d31: Enable feature to turn on when plugged / unplugged.

    * commit '3f30d15383ae806f276ef7512f3a8b8b3a725af2':
      Enable feature to turn on when plugged / unplugged.

commit 9cc3348c77d576009e5038007cdce386cbd0e1b5
Merge: c22e45b 91d996b
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Oct 2 15:46:45 2012 -0700

    am 91d996b9: am af66685d: new kernel prebuilt

    * commit '91d996b95b877b8a2385d6e23c14a43a29d4a03e':
      new kernel prebuilt

commit c22e45b11977753648c0404a7cbb04143617399c
Merge: 3103607 a5b741e
Author: JP Abgrall <jpa@google.com>
Date:   Tue Oct 2 14:53:08 2012 -0700

    am a5b741e7: am 0f37089e: Merge "overlay: Add defaults for SettingsProvider (enable ALS)" into jb-mr1-dev

    * commit 'a5b741e7dcfb44343618f1bad27b505d101694e2':
      overlay: Add defaults for SettingsProvider (enable ALS)

commit 31036077e83353bdb9bc548299ebb1ad8797f63d
Merge: 062240d 5d9d48e
Author: Martijn Coenen <maco@google.com>
Date:   Tue Oct 2 13:01:00 2012 -0700

    am 5d9d48e9: am fd26932e: Manta: NFC: Select the card manager in case of empty select.

    * commit '5d9d48e96300aab2894845af65597acdaf3ee905':
      Manta: NFC: Select the card manager in case of empty select.

commit 062240d004153db8d857b6beb25e846824492865
Merge: 6130c48 98c1ff9
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 2 09:18:54 2012 -0700

    am 98c1ff93: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '98c1ff937f37cf87ae6e9af41678a531a0a18102':
      manta: update kernel prebuilt
      manta: update kernel prebuilt
      take db5db4e80d87fb5647c6d06438b847d2b322408d

commit 6130c48c4cc88120cc22d1b6c4c4871303647dc3
Merge: 0b493fd 0cf0a5b
Author: Benoit Goby <benoit@android.com>
Date:   Mon Oct 1 23:39:24 2012 -0700

    am 0cf0a5bd: am 9f39fb1e: manta: update kernel prebuilt

    * commit '0cf0a5bdaa64959d038fe8c8ac1245bcb7452c12':
      manta: update kernel prebuilt

commit 0b493fd30451456183c6dc9ba289a56cb9fb49eb
Merge: 6963e43 8e0377a
Author: Martijn Coenen <maco@google.com>
Date:   Mon Oct 1 23:39:23 2012 -0700

    am 8e0377a8: am 53cf9e09: Merge "Manta: NFC: Set data connection credits to 1." into jb-mr1-dev

    * commit '8e0377a876350d307e3a199e8bc66f97d145adc9':
      Manta: NFC: Set data connection credits to 1.

commit 6963e43f23583b495c094b77c655c0110a7e9087
Merge: 665d4a6 8c3f213
Author: Simon Wilson <simonwilson@google.com>
Date:   Mon Oct 1 19:49:29 2012 -0700

    am 8c3f213e: am 9904728d: Merge "audio: mute/unmute HDMI audio earlier" into jb-mr1-dev

    * commit '8c3f213e5f5d7e03fc411556cbb3f3d580262cda':
      audio: mute/unmute HDMI audio earlier

commit 665d4a62901e8a995d06f3207189a333d6b9418e
Merge: db4ffcd cf53ff9
Author: Colin Cross <ccross@android.com>
Date:   Mon Oct 1 18:42:37 2012 -0700

    am cf53ff94: am 62217d2d: manta: update kernel prebuilt

    * commit 'cf53ff94b6cb708b4df6d886b12cdd0755431ab1':
      manta: update kernel prebuilt

commit db4ffcd048395bd701b4e1429d67c8b2d3b4c9c1
Merge: 0d1f8fb 4b39e98
Author: Erik Gilling <konkers@android.com>
Date:   Mon Oct 1 18:25:06 2012 -0700

    am 4b39e983: am ceb0c8c0: new kernel prebuilt

    * commit '4b39e983c68a6c00659bde996d7471f9c65c31ca':
      new kernel prebuilt

commit 0d1f8fb076f31d38cc6f16f5847081812a35ad6b
Merge: 55fe817 d7c472b
Author: Craig Mautner <cmautner@google.com>
Date:   Mon Oct 1 17:23:47 2012 -0700

    am d7c472bb: am 34ec1d1d: Merge "Use dev/input/events subsystem for audio jack switches." into jb-mr1-dev

    * commit 'd7c472bbfa410466b56953d6fc94fcf274a091a3':
      Use dev/input/events subsystem for audio jack switches.

commit 55fe817da0997a3dc7b9ca5c3ebe38a82ffe85ee
Merge: bbeb73f 40b7e51
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Oct 1 17:23:38 2012 -0700

    am 40b7e51e: am 109330c6: Merge "Auto-generated manta blob list - GPU compute binaries" into jb-mr1-dev

    * commit '40b7e51ee0f493e3c85cb0675ce9536da7b3984f':
      Auto-generated manta blob list - GPU compute binaries

commit bbeb73fd14eab50b5bec4b6979e18413af0586ae
Merge: b8ebc61 4a2a060
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Mon Oct 1 16:01:44 2012 -0700

    am 4a2a060c: am 366d301c: Merge "wlan: Use XY/7 locale to support HT40" into jb-mr1-dev

    * commit '4a2a060ce80f4c9061736a04d34b97efc0a87682':
      wlan: Use XY/7 locale to support HT40

commit b8ebc61f4b271092a41ee543350db5f26b28f447
Merge: 5813d93 2c02f35
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Oct 1 15:52:21 2012 -0700

    am 2c02f359: am cc187794: Merge "new kernel prebuilt" into jb-mr1-dev

    * commit '2c02f35913221b1b20e6fccd25f7510b280bd4a5':
      new kernel prebuilt

commit 5813d933605ed44eca88266a181bf750abaec3ff
Merge: 2a1d597 e4cd713
Author: Martijn Coenen <maco@google.com>
Date:   Mon Oct 1 14:09:03 2012 -0700

    am e4cd713e: am ff316c08: Merge "Manta: NFC: Disable 424 active in listen mode." into jb-mr1-dev

    * commit 'e4cd713e62b4da9f41312185450171167b5c528b':
      Manta: NFC: Disable 424 active in listen mode.

commit 2a1d597279e9cd37c51a7220af0b74beca2c1f9a
Merge: 5de91b9 ef54840
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Mon Oct 1 13:45:26 2012 -0700

    am ef548404: am af77dd13: Merge "New prebuilt kernel" into jb-mr1-dev

    * commit 'ef5484040c7312846f5a4d8fcc818b2786851fc1':
      New prebuilt kernel

commit 5de91b98ce4f528467bbc8eec5975d315198ce61
Merge: 446a1a9 7338988
Author: Simon Wilson <simonwilson@google.com>
Date:   Mon Oct 1 13:45:25 2012 -0700

    am 73389883: am 96714b68: Merge "audio: mux audio from AIF2 for BT mic/uplink" into jb-mr1-dev

    * commit '733898830e5832698fb9c28fa8d73faa48559479':
      audio: mux audio from AIF2 for BT mic/uplink

commit 446a1a9c2c93fc81caa26eac7d09428ec2132bb0
Merge: 8e99ea5 e8c7987
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Mon Oct 1 13:45:24 2012 -0700

    am e8c79875: am b9928aa5: Allow traversal into /storage/emulated.

    * commit 'e8c798759072b7d48e281190091f94816948948c':
      Allow traversal into /storage/emulated.

commit 8e99ea558575740a49cfb16008989cec74ea61c6
Merge: 40f4ea7 388348f
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Mon Oct 1 13:45:23 2012 -0700

    am 388348f2: am 103d362b: Merge "Final shuffle to make /sdcard work in shell." into jb-mr1-dev

    * commit '388348f29504348a76114421f17a667d8e52199f':
      Final shuffle to make /sdcard work in shell.

commit 40f4ea7b426134cc1d6fdc2209d5164d726c390a
Merge: bf07f8d 03f1801
Author: Glenn Kasten <gkasten@google.com>
Date:   Mon Oct 1 13:45:23 2012 -0700

    am 03f18017: am 77901340: Merge "audio: restore higher period size for capture" into jb-mr1-dev

    * commit '03f18017c492efcd1d586587a7780a93dc235da7':
      audio: restore higher period size for capture

commit bf07f8d8b148e4b216a30e5cab3de420c903bfce
Merge: cad86c2 55ba515
Author: Benoit Goby <benoit@android.com>
Date:   Mon Oct 1 13:45:22 2012 -0700

    am 55ba5157: am b16f061c: manta: update prebuilt kernel

    * commit '55ba5157dd093fa75d48fee69c08d59d8f526308':
      manta: update prebuilt kernel

commit cad86c298b9aa26fbceef14944a6cfcd9c5623da
Merge: 11374bf ca89f37
Author: Colin Cross <ccross@android.com>
Date:   Fri Sep 28 13:18:26 2012 -0700

    am ca89f37a: am 1c51a54f: manta: update kernel prebuilt

    * commit 'ca89f37ac604b1022ce5ee30f90d2601faea6f6b':
      manta: update kernel prebuilt

commit 11374bf531ad3c68e064dfb80e396717cd6fae01
Merge: e2fd79e ceb1867
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 10:49:16 2012 -0700

    am ceb1867c: am c67c658a: Merge "auto-generated blob list" into jb-mr1-dev

    * commit 'ceb1867c20484e209f1316b01d5dcfec6956ba67':
      auto-generated blob list

commit e2fd79e9f34621f4041bb03559a11a592aded035
Merge: f68dc92 f7fa2d0
Author: Dima Zavin <dima@android.com>
Date:   Fri Sep 28 10:39:19 2012 -0700

    am f7fa2d02: am f5ba5bce: manta: update kernel prebuilt

    * commit 'f7fa2d02fa7756e84e3f937c437b124b4c3d3003':
      manta: update kernel prebuilt

commit f68dc92e04270852bdb1777e14227d3147e5302e
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 08:43:16 2012 -0700

    auto-generated blob list

    Bug: 4295425
    Change-Id: I4c6ad76f5701faed70a403e023d102004a2bed4d

commit cf6f2933028a4ab176310428e178db5877352330
Merge: 357dcc6 fe1d728
Author: JP Abgrall <jpa@google.com>
Date:   Fri Sep 28 00:36:53 2012 -0700

    am fe1d728d: am 3c0a16ba: Merge "overlay: config: raise lower-end brightness again" into jb-mr1-dev

    * commit 'fe1d728d2d24b63b6b320bf3f7b820c36b1cf805':
      overlay: config: raise lower-end brightness again

commit 357dcc6d1906fc36c1c54fd0224500862c50e5e9
Merge: 1bd9216 e4b3e91
Author: Colin Cross <ccross@android.com>
Date:   Fri Sep 28 00:36:51 2012 -0700

    am e4b3e917: am db5db4e8: manta: update prebuilt kernel

    * commit 'e4b3e917091dfbe092d7acad9d530c45cacb572f':
      manta: update prebuilt kernel

commit 1bd921667fc368af101d2a69a4b5fa777f58fd6f
Merge: 6c84e02 3165c51
Author: Colin Cross <ccross@android.com>
Date:   Fri Sep 28 00:35:47 2012 -0700

    am 3165c510: am 94e7a969: manta: update kernel prebuilt

    * commit '3165c510b29fdf6c08d3eebc4547b78f4ceda86b':
      manta: update kernel prebuilt

commit 6c84e02a89ffeda27d5f774dfee51b0161da43c5
Merge: c7d5bcf 234e9b6
Author: Colin Cross <ccross@android.com>
Date:   Fri Sep 28 00:34:14 2012 -0700

    am 234e9b67: am 974a3795: manta: update kernel prebuilt

    * commit '234e9b67afcaf85546c202c87a31bd95cabfd644':
      manta: update kernel prebuilt

commit c7d5bcf8836b27f216de0071271e82c691d97f6d
Merge: e0a04e4 11a8e8f
Author: JP Abgrall <jpa@google.com>
Date:   Fri Sep 28 00:33:53 2012 -0700

    am 11a8e8f0: am 56a16c65: overlay: config: raise the lower sensitivity to match dark office.

    * commit '11a8e8f0823e6c9d11d5350b021b072eda015153':
      overlay: config: raise the lower sensitivity to match dark office.

commit e0a04e46e03461a9205257edbe92fe30d0cbc796
Merge: 68b3549 12dc9dd
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Sep 28 00:32:22 2012 -0700

    am 12dc9dd2: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '12dc9dd2243ff453ec915faae640705dc09ffc2f':
      Fix calculation of set of active output devices
      manta: update kernel prebuilt
      New prebuilt kernel

commit 68b3549a98ca13f78a3c4175e75d79f467d901e6
Merge: 7846ccb 2464926
Author: Arve Hjønnevåg <arve@android.com>
Date:   Wed Sep 26 18:22:44 2012 -0700

    am 2464926e: am 5ec4e294: Merge "manta: Reduce amount of reserved lowmem" into jb-mr1-dev

    * commit '2464926e5ca59c79523f6592a0179c9435aa75a6':
      manta: Reduce amount of reserved lowmem

commit 7846ccb3b3266489b162c806dbb3364662ce4d27
Merge: aaea5f4 55595c5
Author: Simon Wilson <simonwilson@google.com>
Date:   Wed Sep 26 17:38:40 2012 -0700

    am 55595c5e: am 1204a2ad: Merge "audio: mute HDMI audio when not in use" into jb-mr1-dev

    * commit '55595c5eef09a5428b6d593c16dfec4bc9b64aaf':
      audio: mute HDMI audio when not in use

commit aaea5f4612bba8fec6c97f431319266a6c97a629
Merge: b0d792f dd6eeab
Author: Martijn Coenen <maco@google.com>
Date:   Wed Sep 26 14:31:44 2012 -0700

    am dd6eeab8: am 351d7c1d: Merge "Manta: NFC: Disable listening for Nfc-B on esE." into jb-mr1-dev

    * commit 'dd6eeab8aac23d99d97fbbb5ff65baaf06903308':
      Manta: NFC: Disable listening for Nfc-B on esE.

commit b0d792ffcd900f3ab831deb248d3136eb3a547be
Merge: 4b1d3da a063fed
Author: Glenn Kasten <gkasten@google.com>
Date:   Wed Sep 26 13:26:19 2012 -0700

    am a063fed6: am c365b569: Merge "Fix calculation of set of active output devices" into jb-mr1-dev

    * commit 'a063fed638109badc55b486170ecd72f8900f3aa':
      Fix calculation of set of active output devices

commit 4b1d3daaa23c739b1c8233f072d4d94d67b9900d
Merge: 767671d 2bd5c5b
Author: Rebecca Zavin <rebecca@android.com>
Date:   Wed Sep 26 13:14:43 2012 -0700

    am 2bd5c5b6: am 12e1ee53: Merge "manta: set Mali power policy as coarse demand" into jb-mr1-dev

    * commit '2bd5c5b62b6f2f05a49d0664d33ed27c66f39ee0':
      manta: set Mali power policy as coarse demand

commit 767671d13982a3e47d423b924aba7a9c4d119feb
Merge: fdb6249 162462d
Author: Martijn Coenen <maco@google.com>
Date:   Wed Sep 26 12:54:14 2012 -0700

    am 162462dc: am 3be5b582: Merge "Manta: NFC: reset the SE when closing the pipe from the DH." into jb-mr1-dev

    * commit '162462dcc72fe078d7215507af2c4a26a5c210f7':
      Manta: NFC: reset the SE when closing the pipe from the DH.

commit fdb6249b1af0263a576006d0051d3c2328547866
Merge: 002254b a24fa23
Author: Colin Cross <ccross@android.com>
Date:   Wed Sep 26 12:02:40 2012 -0700

    am a24fa23c: am 5d2fba4b: manta: update kernel prebuilt

    * commit 'a24fa23cf6fc061f7106c2ea1ad8dc845172c613':
      manta: update kernel prebuilt

commit 002254b01008a76e009a019067f7818a5514a078
Merge: 21c6faa 0d6c3a7
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Sep 26 11:44:51 2012 -0700

    am 0d6c3a7e: am 0a5c23cc: New prebuilt kernel

    * commit '0d6c3a7ef94bfe1a32113994e6707e3dd709427f':
      New prebuilt kernel

commit 21c6faac727b57cfd4b1cb26523609736444fc2a
Merge: 274d03f 5bf2a0a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 26 10:07:47 2012 -0700

    am 5bf2a0a0: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '5bf2a0a0815cc2a06e4a8d27a14d2a0590eda4b0':
      manta: update kernel prebuilt

commit 274d03fd601a869495e81cda41f805c99c95f26a
Merge: 1126e07 1f9c14e
Author: Colin Cross <ccross@android.com>
Date:   Tue Sep 25 22:44:50 2012 -0700

    am 1f9c14e9: am 3f11815f: manta: update prebuilt kernel

    * commit '1f9c14e961f932e8fbd8d2484873caaa75af2909':
      manta: update prebuilt kernel

commit 1126e078e1d8734055151331822e0c144f6df562
Merge: 705d04c e81761f
Author: Todd Poynor <toddpoynor@google.com>
Date:   Tue Sep 25 17:28:51 2012 -0700

    am e81761f2: am cf99e2fd: manta: prebuilt kernel (shutdown on battery 0%, mfc fixes, power reduction)

    * commit 'e81761f2b3ef3840ee8effb163971923b94fd622':
      manta: prebuilt kernel (shutdown on battery 0%, mfc fixes, power reduction)

commit 705d04c254e5ff03c97a5d0c540fa29509d8fc65
Merge: d2faf28 188476a
Author: Simon Wilson <simonwilson@google.com>
Date:   Tue Sep 25 15:48:54 2012 -0700

    am 188476a0: am 4691d082: audio: fix problem with unlinked control updates

    * commit '188476a03498ddcc1f098eecd72ecf194549f731':
      audio: fix problem with unlinked control updates

commit d2faf28b454e3b21e099bd995148e80a915da34e
Merge: b755491 8d81ebe
Author: Todd Poynor <toddpoynor@google.com>
Date:   Tue Sep 25 15:33:51 2012 -0700

    am 8d81ebea: am e93d8439: Merge "manta: power: cpufreq interactive governor params update" into jb-mr1-dev

    * commit '8d81ebea6c2a161b6d6db19482b67738715a8b05':
      manta: power: cpufreq interactive governor params update

commit b755491255a6f254e8ae16de1334e5fcec60bb52
Merge: 0cb8957 6b2b49a
Author: Eino-Ville Talvala <etalvala@google.com>
Date:   Tue Sep 25 15:33:47 2012 -0700

    am 6b2b49a8: am 126539da: Merge "List flash and focusing capability as features for manta." into jb-mr1-dev

    * commit '6b2b49a829e9abaede6abd5e344fd48b04a56cf7':
      List flash and focusing capability as features for manta.

commit 0cb89570cb099a14348d7b8af7342c38db01ad78
Merge: 16a82e2 81be5db
Author: Benoit Goby <benoit@android.com>
Date:   Tue Sep 25 15:33:46 2012 -0700

    am 81be5db0: am a4520697: Merge "manta: update kernel prebuilt" into jb-mr1-dev

    * commit '81be5db0cb45fe56f3df169c8da591c11f6a2c33':
      manta: update kernel prebuilt

commit 16a82e2477c57f82672fe6202205997443bb986c
Merge: 7825124 7871c74
Author: Ken Sumrall <ksumrall@android.com>
Date:   Tue Sep 25 15:33:45 2012 -0700

    am 7871c740: am 81258571: Merge "Set the correct size of the cache partition Manta." into jb-mr1-dev

    * commit '7871c740c00443771636afe752f1f79a2db3c2ab':
      Set the correct size of the cache partition Manta.

commit 78251240f5c8e4dbb37269ea7360920998122cbd
Merge: 03b38ad 3423e2c
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Sep 25 15:33:31 2012 -0700

    am 3423e2c8: am 121ebd00: Merge "Update manta extractors" into jb-mr1-dev

    * commit '3423e2c8a5e1aa21d637afe0404f95280923a2a7':
      Update manta extractors

commit 03b38ad09e8cd31b58f01e789e5e94b4041ddd83
Merge: 994224b 87c01e7
Author: Eric Laurent <elaurent@google.com>
Date:   Tue Sep 25 13:30:06 2012 -0700

    am 87c01e74: am c0feab9f: audio: correct EQ settings.

    * commit '87c01e74e8ab83fbff36f7fc9286433e61593835':
      audio: correct EQ settings.

commit 994224b542e3a6f3d7b9e32d21747d4bf7f8659b
Merge: e24e9f4 95732f9
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Mon Sep 24 17:34:01 2012 -0700

    am 95732f93: am 5aa0f237: manta: kernel prebuilt

    * commit '95732f93ed287f385be351f549d16f722f3f538c':
      manta: kernel prebuilt

commit e24e9f4108058c6578e4a229c7b21c19527f855d
Merge: 30548e9 49bb684
Author: Glenn Kasten <gkasten@google.com>
Date:   Mon Sep 24 16:21:42 2012 -0700

    am 49bb6849: am e0aa8f34: audio: deep buffer path

    * commit '49bb6849314798d736171ef04fb0ec17fbcb996f':
      audio: deep buffer path

commit 30548e97bef35679a2cd78dd2028d5bd98311cf9
Merge: 4c2a82f b24bfa0
Author: Eric Laurent <elaurent@google.com>
Date:   Mon Sep 24 11:19:10 2012 -0700

    am b24bfa06: am fe3b6dc1: Merge "audio: added es305 configuration" into jb-mr1-dev

    * commit 'b24bfa064ac52d6403d598d768a37b5da6e14994':
      audio: added es305 configuration

commit 4c2a82fa2038ac59eb24699b380b118fcb87e11d
Merge: db34003 4b4d527
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Sep 24 10:14:45 2012 -0700

    am 4b4d5270: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '4b4d52709a524958b3ed328781da21aa0ed0ed9e':
      new kernel prebuilt
      cherry-pick d6755f3e19551204f0b6357f1ae98d63029a7b61
      manta: update kernel prebuilt
      new kernel prebuilt
      overlay: config: raise the lower brightness, lower the dim-brightness
      new kernel prebuilt
      Added missing video editor profile to media_profiles.xml file
      Update the userdata partition size to match reality
      New prebuilt kernel
      New prebuilt kernel
      Bring back ADB_EXTERNAL_STORAGE.
      new prebuilt kernel
      New manta prebuilt
      manta: prebuilt kernel (reboot hang fix, memory temperature throttling...)
      manta: update kernel prebuilt
      manta: dumpstate: dump display controller info /d/s3c-fb

commit db340030aa84f0ba2f9e24b4fae242cd7e27b964
Merge: 5ea6414 4f08f95
Author: Martijn Coenen <maco@google.com>
Date:   Mon Sep 24 09:33:05 2012 -0700

    am 4f08f953: am 11ea32a9: Merge "Manta: NFC: Enable RF field events." into jb-mr1-dev

    * commit '4f08f95375db470b50cf03ff3afdf35ceb28e052':
      Manta: NFC: Enable RF field events.

commit 5ea6414dcc1bdc9664e406b5cb89fabe0da7bbb3
Merge: b64c546 4c44bad
Author: Colin Cross <ccross@android.com>
Date:   Mon Sep 24 09:33:04 2012 -0700

    am 4c44bade: am b02233a7: manta: update kernel prebuilt

    * commit '4c44bade616fb28b88f56f67484aa869a4aa1d69':
      manta: update kernel prebuilt

commit b64c546603551c9afa7fa89dd086cc1dfdffe7d5
Merge: e971cfc 82c6605
Author: Colin Cross <ccross@android.com>
Date:   Mon Sep 24 09:33:03 2012 -0700

    am 82c66050: am a3b22209: Revert inadvertant change to init.manta.rc

    * commit '82c66050bd1eefd5dc45b66ed3f41d2dbba1a826':
      Revert inadvertant change to init.manta.rc

commit e971cfc508a858ed46116f6b3919bfb94af5a259
Merge: 26cb41b 716d575
Author: Colin Cross <ccross@android.com>
Date:   Mon Sep 24 09:33:02 2012 -0700

    am 716d5752: am 7bb65d81: manta: update kernel prebuilt

    * commit '716d575247ea83cb12573c6c8f49cd1351b2d369':
      manta: update kernel prebuilt

commit 26cb41b16eccd304b972a2861f7e168f871eae10
Merge: 6f962ae 191dd5a
Author: Matthew Xie <mattx@google.com>
Date:   Mon Sep 24 00:50:45 2012 -0700

    am 191dd5a6: am d5aff2c3: Merge "Configure Manta device class as major Computer minor Laptop" into jb-mr1-dev

    * commit '191dd5a6be23feffe19d4ff948ad017eab355dd8':
      Configure Manta device class as major Computer minor Laptop

commit 6f962aee31a0d3294b751b2300baf599303eb5f0
Merge: 574dfb3 5b15a15
Author: Benoit Goby <benoit@android.com>
Date:   Mon Sep 24 00:49:16 2012 -0700

    am 5b15a15b: am 07f41a7d: Merge "manta: ueventd: Give audio access to video16 to read EDID audio info" into jb-mr1-dev

    * commit '5b15a15b5b1cca0310f2bb4e5df7779affc7c1b9':
      manta: ueventd: Give audio access to video16 to read EDID audio info

commit 574dfb3e95df72b4f59a11d60b8c81be01aa36ad
Merge: dcf02f3 47d9a41
Author: Jeff Brown <jeffbrown@google.com>
Date:   Mon Sep 24 00:48:51 2012 -0700

    am 47d9a417: am d90501db: Merge "Support touch orientation vector." into jb-mr1-dev

    * commit '47d9a4171294e128b558b899638ea5c29ce14b0c':
      Support touch orientation vector.

commit dcf02f36ab60bd7ba9cfd917454ef155e7b95538
Merge: cf81ec9 7f7e0eb
Author: Glenn Kasten <gkasten@google.com>
Date:   Fri Sep 21 12:45:01 2012 -0700

    am 7f7e0eb5: am dd06deb6: audio: remove obsolete lunchbox mixer XML

    * commit '7f7e0eb5f2654c9a26363c871c6da44b3a6e9d7c':
      audio: remove obsolete lunchbox mixer XML

commit cf81ec95b510c766887d7a56ec75e3a0bfea3db3
Merge: d632247 865308c
Author: Dima Zavin <dima@android.com>
Date:   Thu Sep 20 21:43:12 2012 -0700

    am 865308c4: am 05719037: manta: update kernel prebuilt

    * commit '865308c466eb11cd67e348d36fa5ce7366309786':
      manta: update kernel prebuilt

commit d632247bb521c14da28e51ecc220e797ffc6aaa5
Merge: 445c917 027f991
Author: Martijn Coenen <maco@google.com>
Date:   Thu Sep 20 21:42:58 2012 -0700

    am 027f9919: am 9785e2c6: Merge "Manta: NFC: enable error logging." into jb-mr1-dev

    * commit '027f991996664a836576ebf429da824722353321':
      Manta: NFC: enable error logging.

commit 445c91710c11c07e3668e3f52cbceb438e2493b7
Merge: 6405dec 210cd7a
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Sep 20 20:31:06 2012 -0700

    am 210cd7af: am b3a934cc: Merge "new kernel prebuilt" into jb-mr1-dev

    * commit '210cd7afc47df990328a6afed86e40f9f1777dab':
      new kernel prebuilt

commit 6405decafad9529afad17e89a6c2d16a8d26105b
Merge: e2d9eec b6e590a
Author: Todd Poynor <toddpoynor@google.com>
Date:   Thu Sep 20 20:31:06 2012 -0700

    am b6e590a2: am 73130f13: manta: power profile updates

    * commit 'b6e590a21ebcacb585b017a289036754d84c839b':
      manta: power profile updates

commit e2d9eec55d471aae18d55faade6e39b79dd186e8
Merge: 207ad4a b343b83
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Sep 20 20:31:05 2012 -0700

    am b343b836: am 13bbc163: Merge "auto-generated blob list" into jb-mr1-dev

    * commit 'b343b836149557bd79809b0a8fdd5bd86e3b71c6':
      auto-generated blob list

commit 207ad4a60a71fcc8e898d8d491310e362fb37c1a
Merge: 7822df4 356a0dc
Author: Erik Gilling <konkers@android.com>
Date:   Thu Sep 20 15:46:56 2012 -0700

    am 356a0dcd: am d6755f3e: new kernel prebuilt

    * commit '356a0dcd37b92546caa1305eed5336f541a87d1f':
      new kernel prebuilt

commit 7822df407a54fb13f2ba76e15ab6b427ff3d692d
Merge: 7657192 f5679c8
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Thu Sep 20 15:46:20 2012 -0700

    am f5679c84: am 325ceb24: New prebuilt kernel

    * commit 'f5679c843d7332ddaf0db423d8ff708605f2a620':
      New prebuilt kernel

commit 7657192cc36134bd39c0b7b1205b4f9fc7b75e96
Merge: f3e7d21 a77f54a
Author: Colin Cross <ccross@android.com>
Date:   Thu Sep 20 15:46:12 2012 -0700

    am a77f54a5: am dcc049c1: Merge "manta: update kernel prebuilt" into jb-mr1-dev

    * commit 'a77f54a5e8016dc54558a91964c164631b918d4a':
      manta: update kernel prebuilt

commit f3e7d21e1b8d6bb63010d9a0950e04935563976f
Merge: 1279163 3bd7893
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Sep 20 15:46:10 2012 -0700

    am 3bd7893c: am 50b6992b: Merge "Remove references to the proprietary NFC firmware." into jb-mr1-dev

    * commit '3bd7893c0d7ce8e5d38f4cae5ee570444d574aa8':
      Remove references to the proprietary NFC firmware.

commit 1279163102a34ed0958f3f21f89bbcb431043b41
Merge: 424b554 df85139
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Thu Sep 20 12:56:28 2012 -0700

    am df85139b: am c2c962a3: dhcp: Add CLIENTID request to dhcpcd service

    * commit 'df85139bef8f30ea6f91d4583de66e0894def8b3':
      dhcp: Add CLIENTID request to dhcpcd service

commit 424b554a0ceb477e4d3f594f90e96bfbac4dfe81
Merge: 219fdcb f2b2090
Author: Eric Laurent <elaurent@google.com>
Date:   Thu Sep 20 12:56:27 2012 -0700

    am f2b20908: am f38801f9: Merge "audio: different left and right speaker volume" into jb-mr1-dev

    * commit 'f2b209086151ef31ce3e78c6fbdec1776195600c':
      audio: different left and right speaker volume

commit 219fdcb78f5cb7d43a99f32e8689d61cf76b9f49
Merge: dc28da5 f99095a
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Thu Sep 20 06:18:34 2012 -0700

    am f99095a5: am 3ce0846e: Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev

    * commit 'f99095a5179673b3c84f02ac7dc18f7765c8388a':
      Migrate UI to supportsMultipleUsers().

commit dc28da5e09d49a64ff57c8e188d650c8277fb3e8
Merge: a08419f 3020e54
Author: Simon Wilson <simonwilson@google.com>
Date:   Wed Sep 19 15:20:53 2012 -0700

    am 3020e541: am 99f7ad15: Merge "audio: support multiple mixer values per control" into jb-mr1-dev

    * commit '3020e541008d9a8cde448851606c036f6dc70d87':
      audio: support multiple mixer values per control

commit a08419f653d11c59a596115afbd0fe88d102228b
Merge: 617dc30 1efddfc
Author: Chunho Park <chun.ho.park@samsung.com>
Date:   Wed Sep 19 15:20:51 2012 -0700

    am 1efddfcc: am 362e654b: manta: bt: change BT addr path

    * commit '1efddfccbb1499c245b6d2d1b517e3d454c209bd':
      manta: bt: change BT addr path

commit 617dc305aebb90352959d1fc14b6bf434e379191
Merge: 53c30f8 4c38c4a
Author: Colin Cross <ccross@android.com>
Date:   Wed Sep 19 15:19:44 2012 -0700

    am 4c38c4ab: am 1115c1d7: manta: update kernel prebuilt

    * commit '4c38c4ab24ca8ca339335c7f6b03d3f572eb5356':
      manta: update kernel prebuilt

commit 53c30f80ffd7883833e7e8ead3617e0ee2405972
Merge: cbad59b 1a4b9c5
Author: Martijn Coenen <maco@google.com>
Date:   Tue Sep 18 17:17:02 2012 -0700

    am 1a4b9c59: am fda6c27f: Merge "Manta: NFC: include NFC HAL library." into jb-mr1-dev

    * commit '1a4b9c59ac5563a7775cad5aa964f4bb9983f68c':
      Manta: NFC: include NFC HAL library.

commit cbad59bd77a9204e94b30334b848a6e6bc349087
Merge: 9f85c30 7c89dc0
Author: Dima Zavin <dima@android.com>
Date:   Tue Sep 18 17:16:21 2012 -0700

    am 7c89dc08: am 20d9a035: manta: update kernel prebuilt

    * commit '7c89dc0857ce9a91e3653cb415bb10db32c3caf6':
      manta: update kernel prebuilt

Change-Id: I14fe58d761c4f6504563fe21dd970957973cbe24