summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-06Merge "Clarify license terms for Romain Guy's artwork."HEADmastermainBob Badour
2019-06-06Clarify license terms for Romain Guy's artwork.Bob Badour
As discussed with Romain Guy in the email thread, the Apache 2.0 license applies to the affected .jpg files now and retroactively from the time of import. The image was altered using the exiftool: exiftool -WebStatement=http://www.apache.org/licenses/LICENSE-2.0 \ -UsageTerms='Apache License Version 2.0' Change-Id: I9bd4cc7f146240939ca09d14bf12ded790e37988
2011-04-29am a65e875e: New kernel and wifi driver builtandroid-sdk-tools_r12android-sdk-adt_r12Dmitry Shmidt
* commit 'a65e875ec2e778123d151b055919f2ce01434cd3': New kernel and wifi driver built
2011-04-27New kernel and wifi driver builtandroid-sdk-2.3.4_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10gingerbreadDmitry Shmidt
42bad328ba45ee4fe93216e7e99fe79a782d9155 Merge remote branch 'common/android-2.6.35' into android-msm-2.6.35 f5335159eed416b26b7c8a5a4e8820f97dc1ad19 net: wireless: bcm4329: Clean ARP offload table on IP update Change-Id: Ie9270726a5d07b1725bb0d4bec6a1a2715d8df27 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-04-04am 8f63dcbb: New kernel and wifi driver built from kernel.org ↵Mike Lockwood
android-msm-2.6.35 branch * commit '8f63dcbb5f544c17f529c967672760a1d6f9362d': New kernel and wifi driver built from kernel.org android-msm-2.6.35 branch
2011-03-31am b2477ba1: New kernel and wifi driver:Mike Lockwood
* commit 'b2477ba1477f5e4a36c60c6567b5e5dbe3674275': New kernel and wifi driver:
2011-03-29New kernel and wifi driver built from kernel.org android-msm-2.6.35 branchMike Lockwood
This replaces the previous kernels which had been built from a private internal branch. New changes that were merged from common: 0918af8 Merge branch 'android-2.6.35' into android-msm-2.6.35 38d6ab9 net: New iface_stat module to monitor persistent network stats a04760d rtc: alarm: Update hrtimer if alarm at the head of the queue is reprogrammed 5f18c5c cgroup: Remove call to synchronize_rcu in cgroup_attach_task 3b8e587 cgroup: Set CGRP_RELEASABLE when adding to a cgroup 6ce9cbe net: wireless: bcm4329: Disable wake irq at driver stop b7c5917 ARM: etm: Power down etm(s) when tracing is not enabled 4423387 ARM: etm: Support multiple ETMs/PTMs. 8cb5096 ARM: etm: Return the entire trace buffer if it is empty after reset 43cf74e ARM: etm: Add some missing locks and error checks aac8668 ARM: etm: Configure data tracing 295059f ARM: etm: Allow range selection 31f0dde ARM: etm: Don't try to clear the buffer full status after reading the buffer 63ba925 ARM: etm: Don't limit tracing to only non-secure code. 8b92059 ARM: etm: Don't require clock control e29de7a ARM: 6293/1: coresight: cosmetic fixes 95a8c27 ARM: 6294/1: etm: do a dummy read from OSSRR during initialization b1ed394 ARM: 6291/1: coresight: move struct tracectx inside etm driver 674238e ARM: 6292/1: coresight: add ETM management registers 4ef78fa staging: binder: Fix use of uninitialized variable. 50f0d84 net: Add UDP stats and pkt count to uid_stat aa30415 cgroup: leave cg_list valid upon cgroup_exit 0680fcd rtc: alarm: Update hrtimer if alarm at the head of the queue is reprogrammed Change-Id: I15d4754ca76115f94f2ea718b66ae4b0bd12fdad Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-28New kernel and wifi driver:Mike Lockwood
ae71ee1 USB: gadget: f_accessory: Set bNumEndpoints to correct value of 2 Change-Id: I71c0665e5b0b23fa84ebd27b0a87d98774b245d7 Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-14am 7068114b: New kernel and wifi driver:Mike Lockwood
* commit '7068114bf1457777d786ea0ce3a2904879016f8c': New kernel and wifi driver:
2011-03-14New kernel and wifi driver:Mike Lockwood
e41bb45 USB: gadget: f_accessory: Add string for accessory's unique serial number Change-Id: I322351c1294ddd5ab0434209882130340de4fc50 Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-14am ad6592e6: New kernel and wifi driver:Mike Lockwood
* commit 'ad6592e63347ab5e6946755b1b2502da0197eb3b': New kernel and wifi driver:
2011-03-12New kernel and wifi driver:Mike Lockwood
1045a7b USB: gadget: f_accessory: Clear disconnected flag when driver file is opened b9fdcda USB: gadget: f_accessory: Clear previous strings on ACCESSORY_GET_PROTOCOL Change-Id: I935b5014fb9fe7bfc7f9ed5c90da9a588ceca933 Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-10am a9fa99b4: New kernel and wifi driver with USB accessory fixesMike Lockwood
* commit 'a9fa99b4b190cd20db041813a1102b6a396c002d': New kernel and wifi driver with USB accessory fixes
2011-03-10New kernel and wifi driver with USB accessory fixesMike Lockwood
For MR2 only - do not cherry-pick to gingerbread release 5a10a1c net: wireless: bcm4329: Disable wake irq at driver stop 99cd72b USB: gadget: f_accessory: Clear accessory strings when USB is disconnected 3bda3d9 USB: gadget: f_accessory: Misc improvements and cleanup: Change-Id: I70f890107a8e458845d6cac6afb5d92ad29c6c96 Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-02am 59ba0fcf: Add USB accessory support to passion buildsMike Lockwood
* commit '59ba0fcfa80a137559063233916acc5fbab0c8e1': Add USB accessory support to passion builds
2011-03-02am 52e29a88: New prebuilt kernel and wifi driver with USB accessory driver:Mike Lockwood
* commit '52e29a88d629ffa9811e6499d87d064ed14ddc34': New prebuilt kernel and wifi driver with USB accessory driver:
2011-03-02Add USB accessory support to passion buildsMike Lockwood
Change-Id: I07f3f1fda257ce21883308d1bc4bbcb35ba32441 Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-02New prebuilt kernel and wifi driver with USB accessory driver:Mike Lockwood
97e33e0 [ARM] msm: mahimahi: enable CONFIG_USB_ANDROID_ACCESSORY 995e7fe [ARM] msm: mahimahi: Add platform data for USB accessory function ebbac07 USB: gadget: f_accessory: New gadget driver for android USB accesories 3d80010 USB: gadget: android: Fix problem switching vendor IDs eabad62 USB: gadget: android: Support switching vendor ID when configuration changes b28625b USB: gadget: android Fix gadget descriptor compliance for IAD's 49349bf usb: gadget: Fixed Android gadget function discovery & product matching 6b65fd5 USB: gadget: composite: Use separate switches for connected and config state ba86f3d [ARM] usb: msm72k_udc: Fix handling of OUT packets on ep0 with length > 0 08607d4 Merge remote branch 'common/android-2.6.35' into android-msm-2.6.35 6990e94 net: wireless: bcm4329: Cumulative update to Version 4.218.248-18 c59033d ARM: msm: only create rpcrouter pdev once 3c9e01b ext4: initialize the percpu counters before replaying the journal ae40fc4 staging: android: lowmemorykiller: Ignore shmem pages in page-cache fef7520 staging: android: lowmemorykiller: Don't wait more than one second for a process to die 2fcc303 lowmemorykiller: don't unregister notifier from atomic context aae2d66 Merge remote branch 'common/android-2.6.35' into android-msm-2.6.35 49e8954 net: wireless: bcm4329: Fix race conditions for sysioc_thread 9e08a1c net: wireless: bcm4329: Add check for out of bounds scan buffer 1a76f76 net: wireless: bcm4329: Check for out of bounds in scan results parsing 1da5d9e ext4: fix kernel oops if the journal superblock has a non-zero j_errno e5f399a staging: remove Greg's TODO, now obsolete. Change-Id: I3af0fda98f28f3617f45c324d6907d3347133945 Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-02am d4c004cb: passion: ensure gralloc is includedDima Zavin
* commit 'd4c004cbeafb1d1c4313a75cf89b52d0dbbbdddb': passion: ensure gralloc is included
2011-02-02am e3adc210: passion: enable using HW tls registerDima Zavin
* commit 'e3adc210459c9c9f9b64fa094eacf6bcab07c6c6': passion: enable using HW tls register
2011-02-01passion: ensure gralloc is includedandroid-cts-2.3_r2Dima Zavin
Change-Id: Ibb02838a86467ca4d0d370566431ad75ea17e9c6 Signed-off-by: Dima Zavin <dima@android.com>
2011-02-01passion: enable using HW tls registerDima Zavin
Change-Id: I3a0498695572daae2113a9db67eb0534914b87b0 Signed-off-by: Dima Zavin <dima@android.com>
2011-01-05am 5e33e32f: Update wifi/kernel prebuiltsDmitry Shmidt
* commit '5e33e32f5708a01af68c67a73d6aea628186bfd9': Update wifi/kernel prebuilts
2011-01-05Update wifi/kernel prebuiltsDmitry Shmidt
08607d40c9f1dc7875722682f4f148646e89a5b0 Merge remote branch 'common/android-2.6.35' into android-msm-2.6.35 6990e9491e6dae6ade8f2fd0c6e3dd4b14c942aa net: wireless: bcm4329: Cumulative update to Version 4.218.248-18 c59033d144ed5f0c552ccaa8e6ea50b4bc9e86ce ARM: msm: only create rpcrouter pdev once 3c9e01ba204facf4fd4818b8a16a4b3eac5814ed ext4: initialize the percpu counters before replaying the journal ae40fc475e49b72525ccf17fc130ad3921fc1ecd staging: android: lowmemorykiller: Ignore shmem pages in page-cache fef7520029b09bf0abe07c20073881adf2d573c6 staging: android: lowmemorykiller: Don't wait more than one second for a process to die 2fcc30310c515ed3cbb47454285b1bb9072f1efa lowmemorykiller: don't unregister notifier from atomic context Change-Id: I6617f39b1c10ddb27593ef5f24a97056be56dd33 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-30am 5a551830: Update wifi/kernel prebuiltsDima Zavin
* commit '5a5518301736ef972f3ac4cd01232291af78f7f4': Update wifi/kernel prebuilts
2010-11-19Update wifi/kernel prebuiltsDima Zavin
aae2d66 Merge remote branch 'common/android-2.6.35' into android-msm-2.6.35 49e8954 net: wireless: bcm4329: Fix race conditions for sysioc_thread 9e08a1c net: wireless: bcm4329: Add check for out of bounds scan buffer 1a76f76 net: wireless: bcm4329: Check for out of bounds in scan results parsing 1da5d9e ext4: fix kernel oops if the journal superblock has a non-zero j_errno e5f399a staging: remove Greg's TODO, now obsolete. Change-Id: I2856dd7193ac25657d8417a0594740f1f5a6fdfb Signed-off-by: Dima Zavin <dima@android.com>
2010-10-20am 5c27a104: passion-common: update prebuilt kernel/wifiIliyan Malchev
Merge commit '5c27a1040314cd8231cb436c2160f68ba42e36f5' into gingerbread-plus-aosp * commit '5c27a1040314cd8231cb436c2160f68ba42e36f5': passion-common: update prebuilt kernel/wifi
2010-10-20passion-common: update prebuilt kernel/wifiandroid-cts-2.3_r1Iliyan Malchev
Fixes issue 3105577. ba07db7176e3313034f86488608e5af923008cb6 [ARM] msm: qsd8k: audio Change-Id: I8a097c8dbfb95d1dc24997ca19247e0dbc63214b Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-10-17am ac898bd1: Updating device feature list to reflect final configuration.Dan Morrill
Merge commit 'ac898bd101bb375087cc51be30785ad0160c9522' into gingerbread-plus-aosp * commit 'ac898bd101bb375087cc51be30785ad0160c9522': Updating device feature list to reflect final configuration.
2010-10-17Updating device feature list to reflect final configuration.Dan Morrill
Change-Id: Iaf33e49fda9eacf7df8a24902f335282c5b476ab
2010-10-15am ac77b2b8: Merge "Update touch calibration file." into gingerbreadJeff Brown
Merge commit 'ac77b2b8beea0cba0cfaed51dcfd3418a2cc324f' into gingerbread-plus-aosp * commit 'ac77b2b8beea0cba0cfaed51dcfd3418a2cc324f': Update touch calibration file.
2010-10-15Merge "Update touch calibration file." into gingerbreadJeff Brown
2010-10-14Update touch calibration file.Jeff Brown
The format of certain properties changed so we need to update this. Bug: 3096045 Change-Id: I0e8f9f4247a8d7ac364c6d4a6dad17ed97ae80a0
2010-10-14am d23d7999: Update prebuilt wifi/kernelDima Zavin
Merge commit 'd23d799952316613df095268d77a99d333d2ec1f' into gingerbread-plus-aosp * commit 'd23d799952316613df095268d77a99d333d2ec1f': Update prebuilt wifi/kernel
2010-10-14Update prebuilt wifi/kernelDima Zavin
7989b9b i2c: msm: provide more debugging info on xfer errors f08eadd Merge branch 'android-2.6.35' into android-msm-2.6.35 a77b163 yaffs: Import yaffs from Thu Oct 7 10:05:05 2010 +1300 83aa743 pmem: remove the extra up_write on data sem in a rare path 3a19476 mmc: Fix pm_notifier obeying deferred resume (part 2) e74e3f1 mmc: Fix pm_notifier obeying deferred resume Change-Id: Ic43e70791b0428d7fec75d8cd80702cac44f9625 Signed-off-by: Dima Zavin <dima@android.com>
2010-10-13am 8ae5fddb: passion-common: update prebuilt kernel/wifiIliyan Malchev
Merge commit '8ae5fddbf2d8e78e906ce465842c0d7b4e158596' into gingerbread-plus-aosp * commit '8ae5fddbf2d8e78e906ce465842c0d7b4e158596': passion-common: update prebuilt kernel/wifi
2010-10-13am f5812bea: Use the new fancy screen off animation on passion.Joe Onorato
Merge commit 'f5812beaee0c1fccddf8da3a1ec4dc54caf4a72a' into gingerbread-plus-aosp * commit 'f5812beaee0c1fccddf8da3a1ec4dc54caf4a72a': Use the new fancy screen off animation on passion.
2010-10-13passion-common: update prebuilt kernel/wifiIliyan Malchev
e95653f3af1f0c93f3efe0c1b0168381eef7add6 [ARM] msm8k: fixes for audio_ctl and pcm_out Change-Id: Ib0061a98b7b7856a2078fac4864a7146c4b63a7d Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-10-13Use the new fancy screen off animation on passion.Joe Onorato
Change-Id: I6a2a4cae84b9a65b49302f10a132f37f8b2a2b2f
2010-10-11am a9a0e0af: Update kernel prebuiltDima Zavin
Merge commit 'a9a0e0afabeb9e916911e3987639c36f5895b233' into gingerbread-plus-aosp * commit 'a9a0e0afabeb9e916911e3987639c36f5895b233': Update kernel prebuilt
2010-10-11Update kernel prebuiltDima Zavin
f862848 Merge branch 'android-2.6.35' into android-msm-2.6.35 d3b5ed4 mmc: make pm_notifier obey deferred resume Change-Id: If2d52cc63b158cdb635c9f1c1baef4f93ea900fc Signed-off-by: Dima Zavin <dima@android.com>
2010-10-10am cb29a216: Update kernel/wifi prebuiltsDima Zavin
Merge commit 'cb29a2165eb2b0a2a6b76857d53dcc4ee5ba69f5' into gingerbread-plus-aosp * commit 'cb29a2165eb2b0a2a6b76857d53dcc4ee5ba69f5': Update kernel/wifi prebuilts
2010-10-10Update kernel/wifi prebuiltsDima Zavin
ec949a0 mmc: msm_sdcc: Add MMC_PM_IGNORE_PM_NOTIFY for builtin device 827f4e3 Merge branch 'android-2.6.35' into android-msm-2.6.35 e4c42cb ARM: msm: 8x50: request i2c gpios on first use d781f2c video: msm: kgsl: allocate uncached buffers as writecombined e7f35ae mmc: Add "ignore mmc pm notify" functionality 4f1f1d4 Merge remote branch 'stable/linux-2.6.35.y' into android-2.6.35 Change-Id: I16b5eb0d24d9ed79070d2301cf2be32a27bcedf6 Signed-off-by: Dima Zavin <dima@android.com>
2010-10-08am 6c05888a: Update kernel/wifi prebuiltsDima Zavin
Merge commit '6c05888a480057e080acea3bfd93421460b5f9d4' into gingerbread-plus-aosp * commit '6c05888a480057e080acea3bfd93421460b5f9d4': Update kernel/wifi prebuilts
2010-10-07Update kernel/wifi prebuiltsDima Zavin
13f48ba Merge remote branch 'common/android-2.6.35' into android-msm-2.6.35 2ee6bfe [ARM] fiq glue: Align fiq stacks 8ed1714 [ARM] fiq debugger: Allow selection of target cpu ad1531f epoll: make epoll_wait use the hrtimer range feature c745de0 select: rename estimate_accuracy to select_estimate_accuracy a8c11a0 ARM: fiq debugger: Add tty to fiq debugger 438e096 ARM: Add generic fiq serial debugger 7877eab ARM: Add fiq_glue Change-Id: I5b8faa5612f3f8b92046bb7152e0f4edd8be8445 Signed-off-by: Dima Zavin <dima@android.com>
2010-10-01am 66fd9c82: Update kernel/wifi prebultsDima Zavin
Merge commit '66fd9c825586bbc014fd2827d370eb08d1f92cb4' into gingerbread-plus-aosp * commit '66fd9c825586bbc014fd2827d370eb08d1f92cb4': Update kernel/wifi prebults
2010-10-01Update kernel/wifi prebultsDima Zavin
f362bd7 Merge branch 'android-2.6.35' into android-msm-2.6.35 0d3c6a8 ARM: msm: Fix CONFIG_VIRTUAL_KPANIC_PARTITION warning 0dd5a61 sched: use the old min_vruntime when normalizing on dequeue 9234f00 sched: normalize sleeper's vruntime during group change c672809 Merge branch 'android-2.6.35' into android-msm-2.6.35 0549e38 net: wireless: bcm4329: Fix setting HT clock race conditions in driver start Change-Id: Id3e425b08bd7e6f04f9355919be880ffc364c2c8 Signed-off-by: Dima Zavin <dima@android.com>
2010-09-30am 4a57e2f6: Update kernel / wifi prebuildDmitry Shmidt
Merge commit '4a57e2f6ded70ca680f43629fb1bbfde24c9f297' into gingerbread-plus-aosp * commit '4a57e2f6ded70ca680f43629fb1bbfde24c9f297': Update kernel / wifi prebuild
2010-09-29Update kernel / wifi prebuildDmitry Shmidt
bcc4bcb0b7a70d852270d98a03e7baf5b0ec940d Merge branch 'android-2.6.35' into android-msm-2.6.35 66c87b4cab42419fa76cec691dbc7c59a9e73366 Allow CONFIG_STACKTRACE to be enabled by itself. 9572831534751c97ff66c9bea0c2455d86e7b404 net: wireless: bcm4329: Fix setting HT clock race conditions d35bad7fbe9f7c69e50dd0a7f09ef82e80231217 mmc: msm_sdcc: Add MMC_PM_KEEP_POWER to pm_flags for built-in device c7592f1fffbb3bcf64c7d74cfe4544ea8d4a66a1 usb: gadget: android: Remove WAKEUP flag from bmAttributes cd1b918466cc959cc586be46fa984bb23b7b207f Support lseek(2) in ashmem driver b7571940e490f52cc153dbb894fcf3d161625970 l2tp: l2tp_eth: Fix section mismatch warning Change-Id: Ib73302e6f4fed06c8f8a151df6a40cfd77a988e2 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-09-28am 7ea4e6a0: Temporary kernel for monkeys.Dima Zavin
Merge commit '7ea4e6a091540755b4eac2ba7fcc5dede5591284' into gingerbread-plus-aosp * commit '7ea4e6a091540755b4eac2ba7fcc5dede5591284': Temporary kernel for monkeys.
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 11:32:28 +0000