summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove Camera package (it's merged into Gallery package).Chih-Chung Chang2012-03-081-4/+0
| | | | Change-Id: I74762925d0bc0fee114627223e157091b0c0463f
* tuna: prebuilt kernelTodd Poynor2012-03-051-0/+0
| | | | | | | | | 433f58c Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 4125383 Merge branch 'linux-omap-3.0' into android-omap-3.0 f4f9983 ARM: OMAP4: cpuidle: prevent CPU1 from locking CPU0 in idle entry Change-Id: I58afd74c3addf55f7941dfbdbbabdae2a2b1fc4e Signed-off-by: Todd Poynor <toddpoynor@google.com>
* require bootloader PRIMELB02Ed Heyl2012-03-051-1/+1
| | | | Change-Id: Id652f4c1e817caf1436d95c4030088e837a1ac5f
* am 95e70959: am 3a1e624a: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-020-0/+0
|\ | | | | | | * commit '95e709593524b029c2f89c355b6dc552764724b4':
| * am 3a1e624a: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-020-0/+0
| |\ | | | | | | | | | * commit '3a1e624a65a89fe0d9c26025a1c6ee206710c7db':
| | * Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-020-0/+0
| | |\ | | | | | | | | | | | | Change-Id: I968168c66180efa5016376f1142227c614b99a4f
* | | \ am 3b862b18: am 97026117: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-020-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit '3b862b18347c16aa792ab17e9c7f7ae2ff008838':
| * | | am 97026117: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-020-0/+0
| |\ \ \ | | | | | | | | | | | | | | | * commit '97026117389ce210f0dbacc4d3fcc408c98b8db2':
| | * \ \ Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-020-0/+0
| | |\ \ \ | | | | |/ | | | |/| | | | | | Change-Id: I602b2ccaa21c6e74464986286524fd48fb95e620
| | | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-03-020-0/+0
| | | |\ \
* | | | \ \ am 6e16dd4a: (-s ours) am d62a468c: am a71cfea2: tuna: prebuilt kernel -- DO ↵Ken Sumrall2012-03-010-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE * commit '6e16dd4aa2d6def684452458661b4fd6b4f930b3':
| * | | | | am d62a468c: am a71cfea2: tuna: prebuilt kernel -- DO NOT MERGEKen Sumrall2012-03-010-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | * commit 'd62a468c77a16ee54a7b0732329ecb5952149c4b':
| | * | | | am a71cfea2: tuna: prebuilt kernel -- DO NOT MERGEKen Sumrall2012-03-011-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit 'a71cfea22241a46bf0c33c7357f2fa062ea6a74c': tuna: prebuilt kernel -- DO NOT MERGE
* | | | | | am da112516: (-s ours) am 2df8da89: am a71cfea2: tuna: prebuilt kernel -- DO ↵Ken Sumrall2012-03-010-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE * commit 'da112516f89d3911fba4b7de2cc39e420b73b39f': tuna: prebuilt kernel -- DO NOT MERGE
| * | | | | am 2df8da89: am a71cfea2: tuna: prebuilt kernel -- DO NOT MERGEKen Sumrall2012-03-011-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '2df8da89313523e10fcfc7a23d87deba85233b54': tuna: prebuilt kernel -- DO NOT MERGE
| | * | | | am a71cfea2: tuna: prebuilt kernel -- DO NOT MERGEKen Sumrall2012-03-011-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit 'a71cfea22241a46bf0c33c7357f2fa062ea6a74c': tuna: prebuilt kernel -- DO NOT MERGE
| | | * | | tuna: prebuilt kernel -- DO NOT MERGEKen Sumrall2012-03-011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cea631b [MMC] Patch the firmware of certain Samsung emmc parts to fix a bug e638e26 arch: arm: modems: remove pull_up setting for phone active input pin Change-Id: I8fcd868fef56c98884cc19d9999f84f62e968a95 Signed-off-by: Ken Sumrall <ksumrall@android.com>
* | | | | | tuna: prebuilt kernelKen Sumrall2012-03-011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c57a61 [MMC] Patch the firmware of certain Samsung emmc parts to fix a bug Change-Id: I4fad35abc792cec39d1364e9136d0f1b323d5883 Signed-off-by: Ken Sumrall <ksumrall@android.com>
* | | | | | am 46949ccf: am 41dded16: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-010-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit '46949ccf275eff5cccbfc7b706a3498157e2ce70':
| * | | | | am 41dded16: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-010-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | * commit '41dded16ab5dc593c57a3b3edddfed9a8984af34':
| | * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-010-0/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | Change-Id: Ibf44db9c9278138972d0c5c334d90ed8963e2ac6
* | | | | | Merge "lights: remove HAL_MODULE_INFO_SYM const"Nick Kralevich2012-03-011-1/+1
|\ \ \ \ \ \
| * | | | | | lights: remove HAL_MODULE_INFO_SYM constNick Kralevich2012-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HAL_MODULE_INFO_SYM was declared as read-only, but the struct is written to by libhardware. This causes a segfault when -Wl,-z,relro is enabled. Fixed. Change-Id: I209db88c745b3f1a0d0c8f08a287b7b7debd8352
* | | | | | | am 7f543ca8: am d15dfc7d: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-010-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | * commit '7f543ca8955c275b6bbd1c22f0599873a7df69ae':
| * | | | | | am d15dfc7d: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-010-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | * commit 'd15dfc7d051bd2d6ffdaa5db56833d5b969d1e35':
| | * | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-010-0/+0
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | Change-Id: Ib3ccb073933d85ef50d66a0dec7836b60427708c
| | | * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-02-280-0/+0
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
* | | | | | | Merge "Codec components are now dynamically configured."Andreas Huber2012-03-012-0/+120
|\ \ \ \ \ \ \
| * | | | | | | Codec components are now dynamically configured.Andreas Huber2012-03-012-0/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ife617162d1e1bb3e7102ffe1138d580a7b6f61ec
* | | | | | | | tuna: prebuilt kernelDmitry Shmidt2012-03-011-0/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b485eed Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 6d1e480 Merge branch 'android-3.0' into android-omap-3.0 e078a22 net: wireless: bcmdhd: Add SETSUSPENDMODE command 46ec987 net: wireless: bcmdhd: Minor cleaning ee88a6c net: wireless: bcmdhd: Add SET_RANDOM_MAC_SOFTAP option 2757c71 net: wireless: bcmdhd: Update to Version 5.90.195.30 1282ad1 net: wireless: bcmdhd: Update to Version 5.90.195.28 254c20e cfg80211: fix a crash in nl80211_send_station 6a473b4 arch: arm: modems: remove pull_up setting for phone active input pin Change-Id: I87bcafe02e6ddbb496beac8d5ee9128ac11ddf9e Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | | | Remove route setup from dhcpIrfan Sheriff2012-02-291-1/+1
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The connectivity service takes care and now we need this to do ARP verification Change-Id: I6f7e069dfd3a8733fdd36a2ad46aaa6167edb115
* | | | | | Merge "new kernel prebuilt"Erik Gilling2012-02-291-0/+0
|\ \ \ \ \ \
| * | | | | | new kernel prebuiltErik Gilling2012-02-231-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: c0705cc Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 a36e05a Merge branch 'linux-omap-3.0' into android-omap-3.0 c1a2431 gpu: pvr: Update to DDK 1.8@808799 Change-Id: Ic525f557b553b930166a8b97e410c581344cfa47 Signed-off-by: Erik Gilling <konkers@android.com>
* | | | | | | am ffb3289a: (-s ours) am ca904cb4: am 26f6ef77: tuna: prebuilt kernel -- DO ↵Dmitry Shmidt2012-02-280-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE * commit 'ffb3289a2b511b53f658653ce74cde14a5dfa2ec':
| * | | | | | am ca904cb4: am 26f6ef77: tuna: prebuilt kernel -- DO NOT MERGEDmitry Shmidt2012-02-270-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | * commit 'ca904cb4ab9b4c8106e7ccb3b1604c9579a3962b':
| | * | | | | am 26f6ef77: tuna: prebuilt kernel -- DO NOT MERGEDmitry Shmidt2012-02-271-0/+0
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | * commit '26f6ef77f90c2cb72026c01cefe8efcfae1a7567': tuna: prebuilt kernel -- DO NOT MERGE
* | | | | | | am ed2446b2: (-s ours) am 61f8ef1d: am 26f6ef77: tuna: prebuilt kernel -- DO ↵Dmitry Shmidt2012-02-280-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE * commit 'ed2446b298f10ddaf99a20a56d3d81843224dd55': tuna: prebuilt kernel -- DO NOT MERGE
| * | | | | | am 61f8ef1d: am 26f6ef77: tuna: prebuilt kernel -- DO NOT MERGEDmitry Shmidt2012-02-271-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit '61f8ef1d978e9741da48540228d9ee50ea5b1bc7': tuna: prebuilt kernel -- DO NOT MERGE
| | * | | | | am 26f6ef77: tuna: prebuilt kernel -- DO NOT MERGEDmitry Shmidt2012-02-271-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit '26f6ef77f90c2cb72026c01cefe8efcfae1a7567': tuna: prebuilt kernel -- DO NOT MERGE
| | | * | | | tuna: prebuilt kernel -- DO NOT MERGEDmitry Shmidt2012-02-271-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f84aced net: wireless: bcmdhd: Add SET_RANDOM_MAC_SOFTAP option Change-Id: I8f9939300ba3fcb1f75aa2ac61482d3d1a3752a3 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | | | am 5eaa42ed: am ffbd8fef: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-240-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | * commit '5eaa42ed43963118b3869bb99ed439434d75e6c7':
| * | | | | | am ffbd8fef: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-240-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | * commit 'ffbd8feff0b151e26501b95cf0695532839fbc60':
| | * | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-240-0/+0
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | Change-Id: I2913c751897e566a2c153b1d28c5979eeb2e3622
* | | | | | | am 441bc6b2: am 3d4df30e: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-240-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | * commit '441bc6b2e72604824ba21da7e831c00bb6a819e7':
| * | | | | | am 3d4df30e: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-240-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | * commit '3d4df30eb6e4e6e97a7da97e477f86d7474dbad2':
| | * | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-240-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | Change-Id: I4ddbd2ba05b10b03aff1c9031d3629a148be9ce7
| | | * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-02-230-0/+0
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
* | | | | | | Merge "Remove ANAVMID EEPROM values."Martijn Coenen2012-02-241-2/+0
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Remove ANAVMID EEPROM values.Martijn Coenen2012-02-241-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These values are calibrated in the factory and should not be overwritten; they negatively affect both reader and ce performance. See the bug for more details. Bug: 5969862 Change-Id: I031b5b7fbe0ac4930ab08c36add011379c3f9907
* | | | | | | tuna: prebuilt kernelDmitry Shmidt2012-02-231-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e2d6d26 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 deb7ee3 Merge branch 'android-3.0' into android-omap-3.0 d93cdf3 net: wireless: bcmdhd: Turn interface down (only) in case of FW crash bfebf72 net: wireless: bcmdhd: Fix driver hang when resetting Change-Id: Ia4de1c60d1b11f5e4bdc303013f696466c47fc83 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
generated by cgit v1.1 at 2024-05-29 00:54:22 +0000