diff 4.2.1 r1.2

 commit f7f1523015fb1fec9eb61c89740a58803f34fc82
Author: The Android Automerger <android-build@android.com>
Date:   Tue Jan 22 21:07:10 2013 -0800

    JOP40G

commit acb046abd043a10d8478c31f020ea8c33e909e93
Author: The Android Automerger <android-build@android.com>
Date:   Tue Dec 11 13:59:16 2012 -0800

    JOP40F

commit fd74ba5175d01027485d099901b83153aa7afa3c
Author: The Android Automerger <android-build@android.com>
Date:   Thu Nov 29 10:45:10 2012 -0800

    JOP40E
commit e1d91b1ede07f2a8a4d327556cb7d6e5c2247ca2
Author: choongryeol.lee <choongryeol.lee@lge.com>
Date:   Thu Nov 29 16:29:02 2012 -0800

    mako: reduce the power consumption in off-mode charging

    In off-mode charging, we don't need to turn on CPU1 to CPU3.
    So we turn off CPU1 to CPU3 in off-mode charging. By doing this
    we can save 60mA.

    Bug: 7429504

    Change-Id: Ie5d58b6258b7b2d084674fa670f3cc41639a6fd2
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit ad4941c5b47d815711a6a02a64984aae8a4ec595
Author: choongryeol.lee <choongryeol.lee@lge.com>
Date:   Thu Nov 29 16:21:41 2012 -0800

    mako: allow device to sleep in off-mode charging

    In off-mode charging, the device need to go suspend mode
    to reduce power consumption after charging completion.
    This patch enable suspend mode in off-mode charging.

    Bug: 7429504
    Change-Id: I915f0d076c34680d2fbfd8e8b92adb65464b1600
commit 97587c495d77011d1b0d387d6ab4ab277337ac0c
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Jan 28 16:24:27 2013 -0800

    mako: prebuilt kernel

    5194a3d power: charger: need sometime to handle the usb disconnecting events

    Snapshot of commit 7fe73cf5bb8bf37ddc86f35cc7d1046d849c4a88

    Change-Id: I7e58e8b1d2859ebacb802dbe469d45921fe1f606
commit 62b1414bcf9da45381ac2862aed405b641308f54
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Dec 12 16:01:31 2012 -0800

    Snapshot 0d153181bbe9ce75555b437567796a9aef4ef0ae

    Change-Id: I99fb22bd2e10af658de4cfe26470e71bda147ce8

commit 5738f83aeb59361a0a2eda2460113f6dc9194271
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Dec 12 16:00:35 2012 -0800

    Snapshot cdeccf6fdd8c2d494ea2867cb37a025bf8879baf

    Change-Id: Ia2de32ccb97a9641462c72363b0a8c4288f4f36d
commit e9df6ba5a8fcccf306a80b1670b423be8fe7746a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Dec 13 14:55:37 2012 -0800

    Snapshot 7ddd630e136a035ba463c427285c5c3e9f199ee0

    Change-Id: If08c7b905da667dd9e5110231e4592842b634006
commit 525c260303268a83da4c3413b953d13c9084e834
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Dec 13 16:24:26 2012 -0800

    Snapshot 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01

    Change-Id: I3ccb25bf7cde2c22f52260cae0e9957517e6bb5f
commit 7d5f33ed55b9511a64d3e73b33366718972f74af
Author: Devin Kim <dojip.kim@lge.com>
Date:   Fri Dec 7 09:25:06 2012 -0800

    charger: Do not suspend when disconnecting from charger

    The device should be power off when disconnecting from charger.
    If the device enter to suspend, the device couldn't handle the power off
    process. So the device shouldn't suspend to handle the power off at that time

    Bug: 7429504
    Change-Id: I9a0a60e53f315cd83550dc730a33bc7bd464ef67

commit 3493f18985973e35f83b34b737c8fbcb179007c3
Author: choongryeol.lee <choongryeol.lee@lge.com>
Date:   Thu Nov 15 17:03:03 2012 -0800

    charger: suspend enable in charger mode

    To reduce power consumption after charging completion, enable suspend when LCD
    is turned off.

    Bug: 7429504
    Change-Id: I34731dc392661c9051a20cea74f70d94a8aaeb42
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit aae1ce43a45f38b3b4c0fac90e208253fa02ffe6
Author: Iliyan Malchev <malchev@google.com>
Date:   Wed Dec 5 15:19:07 2012 -0800

    libsuspend: compile as a static library

    Compile libsuspend as a static library as well, currently needed by the charger
    code in some cases.

    Related-to-bug: 7429504
    Change-Id: I113017c2c855f915b77c76d8934b6e57c0bb532c
    Signed-off-by: Iliyan Malchev <malchev@google.com>
commit 6a73c51fbf0dfacedc21614b112a1a3f26820afb
Author: Colin Cross <ccross@android.com>
Date:   Tue Nov 20 14:07:39 2012 -0800

    make_ext4fs: fix dentry padding when dentry size is 4088 or 4092

    When the total dentry size is N * 4096 - 4 or N * 4096 - 8, there is
    not enough room in the block to insert an extra padding dentry.
    Instead, switch to always padding the previous dentry out to the end
    of the block, which matches what the kernel does when creating new
    directory entries.

    Also fix dentry_size to return the size of all the dentries
    without the padding, the len + 8 padding is incorrect, and the
    DIV_ROUND_UP will round up to the correct number of blocks.

    Change-Id: If11f90e4ee172c135a0eae2a50b8be213e2dd0dc