summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Update Russian Translation-ICS-Galaxy Nexus Settings" into icsKalimochoAz2012-04-081-0/+22
|\
| * Update Russian Translation-ICS-Galaxy Nexus Settingspvolkov2012-03-101-0/+22
| |
* | Merge "German translation" into icsKalimochoAz2012-04-081-0/+23
|\ \
| * | German translationPatrick Schaaf2012-03-251-0/+23
| | | | | | | | | | | | Change-Id: I09546ed7f9f46a424eab04b0003c9b4cdfb9e19b
* | | Update kernel bin to meet with 4.0.4KalimochoAz2012-04-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update kernel with official google kernel for tuna Update bin kernel to 3.0.27 Update bcmdhd driver to 5.90.195.46 patch2: added new bcdm patches Change-Id: Ic5abd0b7389c0f5f915ec15ac97dd0dbe1700833
* | | Merge remote branch 'remotes/google/master' into HEADKalimochoAz2012-04-0312-54/+252
|\ \ \ | |/ / |/| | | | | | | | Conflicts: kernel
| * | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-210-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: Id3cb6bf8f2357a157056352053da35318decd317
| | * \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-03-160-0/+0
| | |\ \
| | | * | tuna: kernel prebuilt -- DO NOT MERGEDmitry Shmidt2012-03-131-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 034fec9 net: wireless: bcmdhd: Fix mac setting from platform hook Change-Id: I45c7b3a193e652b278334b775b1d10684e1eea01 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-03-120-0/+0
| | | |\ \
| * | | \ \ am 78a7609d: audio: fix audio drop when speaker is selectedEric Laurent2012-03-161-0/+12
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '78a7609d251802da4db864dbbee37967be84514f': audio: fix audio drop when speaker is selected
| | * | | | audio: fix audio drop when speaker is selectedEric Laurent2012-03-161-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When changing audio path to speaker while playback is active, several hundred ms of audio are dropped. This is mostly noticeable when a ringtone starts playing. This change is a workaround forcing the output in standby when speaker is selected. The root cause must still be indentified and fixed. Change-Id: Idef8dc1cdbf2da499a414d0b60244f91ef66e73b
| * | | | | am 3b50cc6d: tuna: kernel prebuilt -- DO NOT MERGEDmitry Shmidt2012-03-131-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '3b50cc6d1c148210fa7b39b1ba48f54f8c5e558d': tuna: kernel prebuilt -- DO NOT MERGE
| | * | | | tuna: kernel prebuilt -- DO NOT MERGEDmitry Shmidt2012-03-131-0/+0
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 034fec9 net: wireless: bcmdhd: Fix mac setting from platform hook Change-Id: I45c7b3a193e652b278334b775b1d10684e1eea01 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| * | | | am babe3f69: tuna: prebuilt kernel -- DO NOT MERGETodd Poynor2012-03-121-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'babe3f69982a0993bb5c219fe34c29c9903f8ccb': tuna: prebuilt kernel -- DO NOT MERGE
| | * | | tuna: prebuilt kernel -- DO NOT MERGETodd Poynor2012-03-091-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 130ff2d ARM: 7296/1: proc-v7.S: remove HARVARD_CACHE preprocessor guards 650239f OMAP4: trim_quirks: Fix wrong implementation of erratum i684 Change-Id: Ic1742aef62a5d983e0a55b64c2e3eac05061e4ef Signed-off-by: Todd Poynor <toddpoynor@google.com>
| * | | | 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 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>
| * | | | 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
| | |\ \ \ | | | |/ / | | |/| |
| * | | | 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>
| * | | | 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
| | |\ \ \ | | | |/ / | | |/| |
| * | | | am c63ec316: tuna: prebuilt kernel -- DO NOT MERGETodd Poynor2012-02-221-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'c63ec3168b6167e76385c9c5d9a96468e85f07c6': tuna: prebuilt kernel -- DO NOT MERGE
| | * | | tuna: prebuilt kernel -- DO NOT MERGETodd Poynor2012-02-221-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5825a20 MFD: TWL 6030: clear IRQ status register only once Change-Id: I7738ba94c5441ef98446de1e2c5f052759f853a4 Signed-off-by: Todd Poynor <toddpoynor@google.com>
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-210-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: I625d93be40b4b6a4e89c918028199639426330da
| | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-02-170-0/+0
| | |\ \ \ | | | |/ / | | |/| |
| * | | | am bed53516: tuna: update kernel prebuilt -- DO NOT MERGEBenoit Goby2012-02-171-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'bed53516982d3c5688d68aae29ea53680ad8fe81': tuna: update kernel prebuilt -- DO NOT MERGE
| | * | | tuna: update kernel prebuilt -- DO NOT MERGEBenoit Goby2012-02-171-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b3a99d OMAP4+: HSI: fix for spurious CAWAKE event while processing RX/TX b18735e OMAP4: HSI: Add HW errata platform data 30624ea OMAP4: HSI: Fix for back to back CAWAKE interrupts Change-Id: I400f3217f3c941e543b79663347e0a2039b3f4c6
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-170-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: Iba93a06323902184286c2d0c370a838f313fb445
| | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-02-160-0/+0
| | |\ \ \ | | | |/ / | | |/| |
| * | | | am 26c2ea0a: tuna: prebuilt kernel -- DO NOT MERGETodd Poynor2012-02-161-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '26c2ea0a893cf9e2e662ff0ea1aca972cb16f085': tuna: prebuilt kernel -- DO NOT MERGE
| | * | | tuna: prebuilt kernel -- DO NOT MERGETodd Poynor2012-02-151-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35315c0 DEBUG: rtc: twl: add register dump if RTC did not fire on time Change-Id: I677478e4c82886f680bd154108b63d8abbe30663 Signed-off-by: Todd Poynor <toddpoynor@google.com>
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: Ic91d3c882c877bac3fa3c26ab62d6c68e2ade8d4
| | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-310-0/+0
| | |\ \ \
| | | * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-300-0/+0
| | | |\ \ \ | | | |/ / / | | |/| | |
| * | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-300-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | Change-Id: I38448f137d45fed527dbcfbae8da9eb4a5fee25b
| | * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-300-0/+0
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| |
| | | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-260-0/+0
| | | |\ \
| | | | * \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-250-0/+0
| | | | |\ \
| | | | | * \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-240-0/+0
| | | | | |\ \
| * | | | | \ \ am c55fbc67: Update kernel prebuilt -- DO NOT MERGEArve Hjønnevåg2012-01-301-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c55fbc67a5c8f02a4663f57844f5bd5bfd3b61bd': Update kernel prebuilt -- DO NOT MERGE
| | * | | | | | Update kernel prebuilt -- DO NOT MERGEArve Hjønnevåg2012-01-271-0/+0
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21f62a0 ARM: omap4: tuna: Add panel configration for SM2A2 Line support. Change-Id: I7af3b742506e14c17218c42e04a0082673814f67
| * | | | | | am 400a1718: tuna: prebuilt kernel -- DO NOT MERGEDmitry Shmidt2012-01-261-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '400a17182e7c28ef2ff7697889689bdbcb87af33': tuna: prebuilt kernel -- DO NOT MERGE
| | * | | | | tuna: prebuilt kernel -- DO NOT MERGEDmitry Shmidt2012-01-261-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec29a34 mmc: omap_hsmmc: Prevent calling mmc_host_lazy_disable() on suspend path Change-Id: I85bb2002f52012d8f11ab4da9c63a8aab158c146 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| * | | | | | am c2ff429f: Merge "audio: support multiple output PCMs" into ics-mr1Simon Wilson2012-01-261-48/+117
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c2ff429f7bea57e0d774544ec9aeac4c25497317': audio: support multiple output PCMs
| | * | | | | Merge "audio: support multiple output PCMs" into ics-mr1Simon Wilson2012-01-261-48/+117
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
generated by cgit v1.1 at 2024-04-28 08:55:29 +0000