summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-11-13flo: update prebuilt kernel [DO NOT MERGE] am: d399edd854 am: 847c689aea am: ↵HEADandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-mr2-preview-2android-n-mr2-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2mastermainPatrick Tjin
aed31fffc4 -s ours am: d7b1098bf5 am: 4ca71f7e5b am: 3889062693 * commit '3889062693215b33121a03e0ca743563aba6ce37': flo: update prebuilt kernel [DO NOT MERGE]
2015-11-13flo: update prebuilt kernel [DO NOT MERGE] am: d399edd854 am: 847c689aea am: ↵marshmallow-dr1.5-devPatrick Tjin
aed31fffc4 -s ours am: d7b1098bf5 am: 4ca71f7e5b * commit '4ca71f7e5bd58e63747f8bb6f2fab9b888b2d112': flo: update prebuilt kernel [DO NOT MERGE]
2015-11-13flo: update prebuilt kernel [DO NOT MERGE] am: d399edd854 am: 847c689aea am: ↵Patrick Tjin
aed31fffc4 -s ours am: d7b1098bf5 * commit 'd7b1098bf54cd61a6ec3c8d7c2e6ae3b44d78756': flo: update prebuilt kernel [DO NOT MERGE]
2015-11-13flo: update prebuilt kernel [DO NOT MERGE] am: d399edd854 am: 847c689aeaPatrick Tjin
am: aed31fffc4 -s ours * commit 'aed31fffc44f66df9cd735b240c97093847054e6': flo: update prebuilt kernel [DO NOT MERGE]
2015-11-13flo: update prebuilt kernel [DO NOT MERGE] am: d399edd854Patrick Tjin
am: 847c689aea * commit '847c689aea6201b497e3f8a76838d9aa4f383aa3': flo: update prebuilt kernel [DO NOT MERGE]
2015-11-13flo: update prebuilt kernel [DO NOT MERGE]Patrick Tjin
am: d399edd854 * commit 'd399edd854e972ba7b562bb828a78863cec14e76': flo: update prebuilt kernel [DO NOT MERGE]
2015-11-13flo: update prebuilt kernel [DO NOT MERGE]Patrick Tjin
cb30e61 arm/configs: flo: Remove SysV IPC from kernel bd91fe6 msm: ipc_socket: fix leak of kernel memory to userspace Bug: 24551430 Bug: 22300191 Bug: 24157888 Linux version 3.4.0-gcb30e61 (android-build@vped8.mtv.corp.google.com) (gcc version 4.6.x-google 20120106 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Nov 13 16:52:51 UTC 2015 Change-Id: Ieb4c1e93b223ca4b00d14f1ccdc7ffec7c340cb5 Signed-off-by: Patrick Tjin <pattjin@google.com>
2015-11-12resolve merge conflicts of c45b2cc525 to lmp-mr1-app-dev. am: 610cf316a8 am: ↵Ed Tam
542b135203 -s ours am: a40e99046b am: 6eb7c74188 am: ba85a48271 * commit 'ba85a48271c8a5fd6d43653dffe153a40a100125': flo: update prebuilt kernel [DO NOT MERGE]
2015-11-12resolve merge conflicts of c45b2cc525 to lmp-mr1-app-dev. am: 610cf316a8 am: ↵android-6.0.1_r68android-6.0.1_r67android-6.0.1_r62android-6.0.1_r54android-6.0.1_r53android-6.0.1_r45android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21marshmallow-dr1.6-releasemarshmallow-dr1.5-releaseEd Tam
542b135203 -s ours am: a40e99046b am: 6eb7c74188 * commit '6eb7c74188e27b5d271b22e4f776cba854c8a06e': flo: update prebuilt kernel [DO NOT MERGE]
2015-11-12resolve merge conflicts of c45b2cc525 to lmp-mr1-app-dev. am: 610cf316a8 am: ↵Ed Tam
542b135203 -s ours am: a40e99046b * commit 'a40e99046b1746c72c4ca897ecb46a31b78c40cc': flo: update prebuilt kernel [DO NOT MERGE]
2015-11-12resolve merge conflicts of c45b2cc525 to lmp-mr1-app-dev. am: 610cf316a8Ed Tam
am: 542b135203 -s ours * commit '542b1352034cdd269395dd004a8e04a7f9cefb11': flo: update prebuilt kernel [DO NOT MERGE]
2015-11-12resolve merge conflicts of c45b2cc525 to lmp-mr1-app-dev.Ed Tam
am: 610cf316a8 * commit '610cf316a8751839359e0b3142c3e4e8e30d1446': flo: update prebuilt kernel [DO NOT MERGE]
2015-11-12resolve merge conflicts of c45b2cc525 to lmp-mr1-app-dev.Ed Tam
Change-Id: I6d5d44715aa7352eebaf925fb4bb33d69e8779fc
2015-11-11flo: update prebuilt kernel [DO NOT MERGE]Ed Tam
Kernel to be used by deb only. Removing flo-only patches. b90dc8e Revert "Revert "Revert "keys: notify system preparing to force reset if resetkey is defined""" e26fda0 Revert "Revert "Revert "flo/deb: keypad: set powerkey button to have reset notification"" 784f40f Revert "Revert "Revert "mmc: add force poweroff notify and sw reset for some card""" c7b6506 mm: fix prctl_set_vma_anon_name Bug: 20017123 Linux version 3.4.0-gb90dc8e (android-build@vpef4.mtv.corp.google.com) (gcc version 4.6.x-google 20120106 (prerelease) (GCC) ) #1 SMP PREEMPT Thu Nov 12 00:07:10 UTC 2015 Change-Id: I49be06a5eaecb89ef1ca87d289b6ec04211ad106 Signed-off-by: Ed Tam <etam@google.com>
2015-10-29flo: update prebuilt kernel [DO NOT MERGE] am: 3e7c916c80 -s ours am: ↵Ed Tam
3f7a22e29f am: 19ba6f1b0b * commit '19ba6f1b0bf1f684cb7ae4e283390ce58e3b0ed9': flo: update prebuilt kernel [DO NOT MERGE]
2015-10-29flo: update prebuilt kernel [DO NOT MERGE] am: 3e7c916c80 -s oursEd Tam
am: 3f7a22e29f * commit '3f7a22e29fd16d35ec7a4b2b15f78d9defc47a34': flo: update prebuilt kernel [DO NOT MERGE]
2015-10-29flo: update prebuilt kernel [DO NOT MERGE]Ed Tam
am: 3e7c916c80 -s ours * commit '3e7c916c8015dc18bff691e8508b2b09895e6c41': flo: update prebuilt kernel [DO NOT MERGE]
2015-10-29flo: update prebuilt kernel [DO NOT MERGE]Ed Tam
22579f2 mm: fix prctl_set_vma_anon_name Bug: 20017123 Linux version 3.4.0-g22579f2 (android-build@kpfj2.cbf.corp.google.com) (gcc version 4.8 (GCC) ) #1 SMP PREEMPT Mon Oct 26 22:54:18 UTC 2015 Change-Id: I97a2183c4da08380a1d55e439dfc68ed729b25e6 Signed-off-by: Ed Tam <etam@google.com>
2015-10-26flo: update prebuilt kernel am: 18a2517e3eandroid-n-preview-1Ed Tam
am: cefceb7fd0 * commit 'cefceb7fd08c67ff2723bfa05f065ef576af702d': flo: update prebuilt kernel
2015-10-26flo: update prebuilt kernelEd Tam
am: 18a2517e3e * commit '18a2517e3e8a7bddbdbdb76bbb30267a081a12a7': flo: update prebuilt kernel
2015-10-26flo: update prebuilt kernelandroid-6.0.1_r63android-6.0.1_r55android-6.0.1_r5android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r3android-6.0.1_r18android-6.0.1_r16android-6.0.1_r1android-6.0.0_r41marshmallow-mr1-devmarshmallow-dr-dragon-releaseEd Tam
8ba2631 mm: fix prctl_set_vma_anon_name a314b7c flo: update build.config for MNC MR1 branch Bug: 20017123 Linux version 3.4.0-g8ba2631 (android-build@kpfj14.cbf.corp.google.com) (gcc version 4.8 (GCC) ) #1 SMP PREEMPT Mon Oct 26 06:21:20 UTC 2015 Change-Id: I2d3cd83bbffd1efb650f76f95798d0eb5ba1d80d Signed-off-by: Ed Tam <etam@google.com>
2015-10-19flo: update prebuilt kernel [DO NOT MERGE] am: 9ec6511640 -s ours am: ↵Patrick Tjin
1c2f208b73 -s ours am: eef07923b8 -s ours * commit 'eef07923b8aa3b138adbca9003f68e50e0e45adb': flo: update prebuilt kernel [DO NOT MERGE]
2015-10-19flo: update prebuilt kernel [DO NOT MERGE] am: 9ec6511640 -s oursPatrick Tjin
am: 1c2f208b73 -s ours * commit '1c2f208b731c5734e18de1974d2d69bc1282347e': flo: update prebuilt kernel [DO NOT MERGE]
2015-10-19flo: update prebuilt kernel [DO NOT MERGE]Patrick Tjin
am: 9ec6511640 -s ours * commit '9ec651164006c6d7d314a6f3a771032522cfed84': flo: update prebuilt kernel [DO NOT MERGE]
2015-10-16flo: update prebuilt kernel am: 095d772778Patrick Tjin
am: 2ae6336a1f * commit '2ae6336a1f8456f3b7d6cc92e4c8eb495fb36ed1': flo: update prebuilt kernel
2015-10-16flo: update prebuilt kernelPatrick Tjin
am: 095d772778 * commit '095d772778532a52ccf18ebcfb6a201707e88875': flo: update prebuilt kernel
2015-10-16flo: update prebuilt kernel [DO NOT MERGE]Patrick Tjin
a257609 msm: ipc_socket: fix leak of kernel memory to userspace 034b3a1 arm/configs: flo: Remove SysV IPC from kernel 2256139 Update build.config for android-msm-flo-3.4-mnc Bug: 24157888 Bug: 24551430 Bug: 22300191 Linux version 3.4.0-ga257609 (android-build@wpix7.hot.corp.google.com) (gcc version 4.8 (GCC) ) #1 SMP PREEMPT Thu Oct 15 23:11:00 UTC 2015 Change-Id: I328016f1ee8e6cf2bb1b81e67d9a807485e54cfa Signed-off-by: Patrick Tjin <pattjin@google.com>
2015-10-16flo: update prebuilt kernelPatrick Tjin
4b3d11e msm: ipc_socket: fix leak of kernel memory to userspace bd8d871 arm/configs: flo: Remove SysV IPC from kernel Bug: 24157888 Bug: 24551430 Bug: 22300191 Linux version 3.4.0-g4b3d11e (android-build@vpak12.mtv.corp.google.com) (gcc version 4.8 (GCC) ) #1 SMP PREEMPT Thu Oct 15 21:35:13 UTC 2015 Change-Id: I8a1e805ebc8db586ecc363ca917fdaa100d5fd04 Signed-off-by: Patrick Tjin <pattjin@google.com>
2015-09-03flo: update prebuilt kernel automerge: df4da2cf12 -s ours automerge: ↵Patrick Tjin
a5d6247bde automerge: ec7728182c automerge: d3d87f4efd automerge: 4bd8c132ed * commit '4bd8c132ed60f531389f430cb9237afc1b27a581': flo: update prebuilt kernel
2015-09-03flo: update prebuilt kernel automerge: df4da2cf12 -s ours automerge: ↵Patrick Tjin
a5d6247bde automerge: ec7728182c automerge: d3d87f4efd * commit 'd3d87f4efd510399401e8c5adf22d8912144a17d': flo: update prebuilt kernel
2015-09-03flo: update prebuilt kernel automerge: df4da2cf12 -s ours automerge: a5d6247bdemarshmallow-dr-devPatrick Tjin
automerge: ec7728182c * commit 'ec7728182c5bbbd6951263667c43eca40b1780c7': flo: update prebuilt kernel
2015-09-03flo: update prebuilt kernel automerge: df4da2cf12 -s oursPatrick Tjin
automerge: a5d6247bde * commit 'a5d6247bde8e2e1e0539752f122565da5f58bae8': flo: update prebuilt kernel
2015-09-03flo: update prebuilt kernelPatrick Tjin
automerge: df4da2cf12 -s ours * commit 'df4da2cf12b94241f23ab42217927ed3eccadbd0': flo: update prebuilt kernel
2015-09-03flo: update prebuilt kernel automerge: d7e39a5553 -s ours automerge: ↵Patrick Tjin
f13b9ee8de automerge: 6fe682dd7d automerge: 7d7749f25c automerge: 56e875b2c7 * commit '56e875b2c75a657a01f441924f7f6b58f45bc072': flo: update prebuilt kernel
2015-09-03flo: update prebuilt kernel automerge: d7e39a5553 -s ours automerge: ↵Patrick Tjin
f13b9ee8de automerge: 6fe682dd7d automerge: 7d7749f25c * commit '7d7749f25c8612c67e8a30aa0d752421b81886a2': flo: update prebuilt kernel
2015-09-03flo: update prebuilt kernel automerge: d7e39a5553 -s ours automerge: f13b9ee8dePatrick Tjin
automerge: 6fe682dd7d * commit '6fe682dd7d5db0545aeabcc1a8983ca268ceda46': flo: update prebuilt kernel
2015-09-03flo: update prebuilt kernel automerge: d7e39a5553 -s oursPatrick Tjin
automerge: f13b9ee8de * commit 'f13b9ee8dec8dcb97928b4dcdd58e04ba5252e5e': flo: update prebuilt kernel
2015-09-03flo: update prebuilt kernelPatrick Tjin
automerge: d7e39a5553 -s ours * commit 'd7e39a55533fd55cc0213978f8ad7fceadee4b3e': flo: update prebuilt kernel
2015-09-03flo: update prebuilt kernel automerge: e437f2b6b5 -s ours automerge: ↵Thierry Strudel
df80797d50 automerge: 99c97663a7 automerge: 7cc9e491bb automerge: 03956865cc * commit '03956865cc9a2ae6ecaae0ce9566844b30ab012c': flo: update prebuilt kernel
2015-09-03flo: update prebuilt kernel automerge: e437f2b6b5 -s ours automerge: ↵Thierry Strudel
df80797d50 automerge: 99c97663a7 automerge: 7cc9e491bb * commit '7cc9e491bb8ed39820287d5cfb8314f89d01f220': flo: update prebuilt kernel
2015-09-03flo: update prebuilt kernel automerge: e437f2b6b5 -s ours automerge: df80797d50Thierry Strudel
automerge: 99c97663a7 * commit '99c97663a70c6303a6ce5336aef91059ae2bbfb7': flo: update prebuilt kernel
2015-09-03flo: update prebuilt kernel automerge: e437f2b6b5 -s oursThierry Strudel
automerge: df80797d50 * commit 'df80797d50acc5c513e02026a5f577eae4631c6e': flo: update prebuilt kernel
2015-09-03flo: update prebuilt kernelThierry Strudel
automerge: e437f2b6b5 -s ours * commit 'e437f2b6b5e39da334104cacdc5cfa4966daa71e': flo: update prebuilt kernel
2015-08-26flo: update prebuilt kernel automerge: 21be986Ed Tam
automerge: 537361a * commit '537361a3f1cd04b3e3019b384ce374b9420835e7':
2015-08-26flo: update prebuilt kernel automerge: 2b974fdThierry Strudel
automerge: 6b80252 * commit '6b8025267c9bc0c803afeb0369f4888c2765594c':
2015-08-26flo: update prebuilt kernel automerge: 95810f5Thierry Strudel
automerge: 9274671 * commit '9274671d54e7de48e1545cbf1fe94f859e48d6f9':
2015-08-26flo: update prebuilt kernel automerge: 318294aThierry Strudel
automerge: f5963f9 * commit 'f5963f97e493cded2812a598327620ad02aa9367':
2015-08-26flo: update prebuilt kernel automerge: 155ffefEd Tam
automerge: 67598cf * commit '67598cf41295102cfc31a22f6dc4ae261ed8dbb4':
2015-08-26flo: update prebuilt kernel automerge: 3a4d052Ed Tam
automerge: 4d211f6 * commit '4d211f6675804793b93867b4d9d7c8a033c1e837':
2015-08-17flo: update prebuilt kernel automerge: 21be986Ed Tam
automerge: acc2587 * commit 'acc258761e69f881899d098babd430d485d9f213': flo: update prebuilt kernel
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 15:17:21 +0000