summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-140-0/+0
|\
| * tuna: prebuilt kernel (BT power, DDK revert, gadget fix)Todd Poynor2012-08-131-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6487a87 Revert "gpu: pvr: Update to DDK 1.9.RC1.JB@2113614" 9c15339 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 7073962 Merge branch 'android-3.0' into android-omap-3.0 9a6bc34 netfilter: xt_IDLETIMER: Rename INTERFACE to LABEL in netlink notification. e15cb99 net: wireless: bcmdhd: Use correct time from boot for TSF 6d33163 Tuna bluetooth: set rfkill state before register it a1bc297 scripts/Kbuild.include: Fix portability problem of "echo -e" 19aecca gpu: pvr: Update to DDK 1.9.RC1.JB@2113614 d904c9f Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 b7fa52e Merge branch 'linux-omap-3.0' into android-omap-3.0 647167a Merge branch 'android-3.0' into android-omap-3.0 2fa1f1c USB: gadget: f_audio_source: Fix error handling and increase packet size 1eee0cb OMAP: mcspi: Perform NULL pointer check before accessing cd->swap_datalines 1b8153c OMAP4: hsmmc: fix race conditions in suspend/resume path Change-Id: I0faa1be16859270f88a0a0b03dfdc1c1e930073b
| * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-130-0/+0
| |\
| | * Revert "prebuilt kernel (DDK 1.9RC1, usb gadget,...)"JP Abgrall2012-08-081-0/+0
| | | | | | | | | | | | | | | | | | This reverts commit a424e789f4790778bdd962bd2a032f64050eba89. Bug: 6951799
* | | Merge "Specify destination sdcard mount point." into jb-mr1-devJeff Sharkey2012-08-131-1/+1
|\ \ \
| * | | Specify destination sdcard mount point.Jeff Sharkey2012-08-131-1/+1
| |/ / | | | | | | | | | | | | Bug: 6925012 Change-Id: Ib9d5ce0dfba3669e75a9c57af9f7ae3872bb6235
* | | tuna: prebuilt kernel (BT power, DDK revert, gadget fix)Todd Poynor2012-08-131-0/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6487a87 Revert "gpu: pvr: Update to DDK 1.9.RC1.JB@2113614" 9c15339 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 7073962 Merge branch 'android-3.0' into android-omap-3.0 9a6bc34 netfilter: xt_IDLETIMER: Rename INTERFACE to LABEL in netlink notification. e15cb99 net: wireless: bcmdhd: Use correct time from boot for TSF 6d33163 Tuna bluetooth: set rfkill state before register it a1bc297 scripts/Kbuild.include: Fix portability problem of "echo -e" 19aecca gpu: pvr: Update to DDK 1.9.RC1.JB@2113614 d904c9f Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 b7fa52e Merge branch 'linux-omap-3.0' into android-omap-3.0 647167a Merge branch 'android-3.0' into android-omap-3.0 2fa1f1c USB: gadget: f_audio_source: Fix error handling and increase packet size 1eee0cb OMAP: mcspi: Perform NULL pointer check before accessing cd->swap_datalines 1b8153c OMAP4: hsmmc: fix race conditions in suspend/resume path Change-Id: I0faa1be16859270f88a0a0b03dfdc1c1e930073b
* | Merge "Update config.xml overlay for new key ↵Nick Pelly2012-08-101-5/+3
|\ \ | | | | | | | | | config_overlay_locationProviderPackageNames" into jb-mr1-dev
| * | Update config.xml overlay for new key ↵Nick Pelly2012-08-091-5/+3
| | | | | | | | | | | | | | | | | | config_overlay_locationProviderPackageNames Change-Id: Iee90badf46f797a2fdf76e8fbfef61b8edc0c340
* | | am 486ff618: am 18c08871: Merge "Fix build - Add TARGET_ARCH := arm"Jean-Baptiste Queru2012-08-101-0/+1
|\ \ \ | |/ / |/| | | | | | | | * commit '486ff6180854d6c51545ea9fba0752a3be4e3947': Fix build - Add TARGET_ARCH := arm
| * | am 18c08871: Merge "Fix build - Add TARGET_ARCH := arm"Jean-Baptiste Queru2012-08-101-0/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '18c08871ca28fa11d59f6f6ebaf5e9de035d1528': Fix build - Add TARGET_ARCH := arm
| | * \ Merge "Fix build - Add TARGET_ARCH := arm"Jean-Baptiste Queru2012-08-101-0/+1
| | |\ \
| | | * | Fix build - Add TARGET_ARCH := armJean-Baptiste Queru2012-08-101-0/+1
| | |/ / | | | | | | | | | | | | Change-Id: I6e4b534b18be8fea3b7fff1bcdc7931399456db4
* | | | Revert "prebuilt kernel (DDK 1.9RC1, usb gadget,...)"JP Abgrall2012-08-081-0/+0
| |_|/ |/| | | | | | | | | | | | | | This reverts commit a424e789f4790778bdd962bd2a032f64050eba89. Bug: 6951799
* | | prebuilt kernel (DDK 1.9RC1, usb gadget,...)JP Abgrall2012-08-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19aecca gpu: pvr: Update to DDK 1.9.RC1.JB@2113614 d904c9f Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 b7fa52e Merge branch 'linux-omap-3.0' into android-omap-3.0 647167a Merge branch 'android-3.0' into android-omap-3.0 2fa1f1c USB: gadget: f_audio_source: Fix error handling and increase packet size 1eee0cb OMAP: mcspi: Perform NULL pointer check before accessing cd->swap_datalines 1b8153c OMAP4: hsmmc: fix race conditions in suspend/resume path Change-Id: I42406dded6ffe73285fbc85cf8a23f05f030327e
* | | am ff348a5d: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-070-0/+0
|\ \ \ | |/ / | | | | | | * commit 'ff348a5dae7dd3629ec691483c954199e1dcb3ca':
| * | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-070-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: I92b44c4f1980cd33d7c2480d63775de30aebcb15
| | * \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-08-070-0/+0
| | |\ \
* | | \ \ am afbf2174: (-s ours) am b69d5d1b: tuna: kernel prebuilt DO NOT MERGEMike Lockwood2012-08-060-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'afbf2174cbc814c289e200915add80b440f960d3': tuna: kernel prebuilt DO NOT MERGE
| * | | | am b69d5d1b: tuna: kernel prebuilt DO NOT MERGEMike Lockwood2012-08-061-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'b69d5d1b10665e094af53ffddc738cba2be17ff4': tuna: kernel prebuilt DO NOT MERGE
| | * | | tuna: kernel prebuilt DO NOT MERGEMike Lockwood2012-08-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d904c9f Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 b7fa52e Merge branch 'linux-omap-3.0' into android-omap-3.0 647167a Merge branch 'android-3.0' into android-omap-3.0 2fa1f1c USB: gadget: f_audio_source: Fix error handling and increase packet size e6a34c5 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 5696a46 Merge branch 'android-3.0' into android-omap-3.0 e463932 net: wireless: bcmdhd: Fill station_info packet fields 62618c1 net: wireless: bcmdhd: Prevent HT Avail request failure to flood the log 3421d0b net: wireless: bcmdhd: Use proper jiffie-related functions c491722 net: wireless: bcmdhd: Adjust driver/fw/chip info format Change-Id: Ie4cefaae0936d78a8b27e2eea8dd960833da1f67 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | | am 8a6e4e7a: am de5687d9: Merge "add permissions to dev/cdam_cplog"Wink Saville2012-08-041-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '8a6e4e7ab376049a0896682fcdf2f4170f0084b8': add permissions to dev/cdam_cplog
| * | | | am de5687d9: Merge "add permissions to dev/cdam_cplog"Wink Saville2012-08-041-0/+3
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit 'de5687d944cad89f71a45af6aa4b8c94dbf77148': add permissions to dev/cdam_cplog
| | * | | Merge "add permissions to dev/cdam_cplog"Wink Saville2012-08-041-0/+3
| | |\ \ \
| | | * | | add permissions to dev/cdam_cplogdw0918.jeon2012-08-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | needed to collect the modem logs Change-Id: Ic5e0e8c508c04988dd9ac9ddb33a04978c86c4bc Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
* | | | | | am 56fd40d6: (-s ours) Reconcile with jb-release - do not mergeThe Android Open Source Project2012-08-030-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '56fd40d6b79e3797bb98e1ec4de48fbe3bab3807': tuna: kernel prebuilt
| * | | | | Reconcile with jb-release - do not mergeThe Android Open Source Project2012-08-030-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia8f74e9a44cd3d6b00c9dd2b9ca7707543cd9512
| | * \ \ \ \ Reconcile AOSP and GOOG jb-releaseThe Android Open Source Project2012-08-030-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I839cd906eb192f42bb679f20cdd39b71394cec70
| | | * | | | | tuna: kernel prebuiltBenoit Goby2012-08-031-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 396c4df Toro: Update USB gadget for DM feature Bug: 6829107 Change-Id: I8a33a3fae8bf7eb4e6c19f327f0f9b70ed056fa0
* | | | | | | | am 0440f359: am 2c119692: Merge "add toroplus to the recovery target"Jean-Baptiste Queru2012-08-021-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '0440f3598c061d3bb8021d01765dc9b9ad6c3c27': add toroplus to the recovery target
| * | | | | | | am 2c119692: Merge "add toroplus to the recovery target"Jean-Baptiste Queru2012-08-021-1/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '2c119692f23042efba0d0c500c722c256aee25b3': add toroplus to the recovery target
| | * | | | | | Merge "add toroplus to the recovery target"Jean-Baptiste Queru2012-08-021-1/+1
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | add toroplus to the recovery targetMadan Ankapura2012-08-021-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4405e50d6ac87c4f52e8ca14de125087854be082 Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
* | | | | | | am 9d64e08b: Reconcile with jb-releaseThe Android Open Source Project2012-07-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9d64e08b9da1a6b561875b7eb5d368a29850b14e': tuna: kernel prebuilt tuna: kernel prebuilt
| * | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-07-270-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | Change-Id: Id00ee4dbf7918503ceb87107145632bb64f62e83
| | * | | | | tuna: kernel prebuiltBenoit Goby2012-07-241-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 396c4df Toro: Update USB gadget for DM feature Bug: 6829107 Change-Id: I8a33a3fae8bf7eb4e6c19f327f0f9b70ed056fa0
| | * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-07-240-0/+0
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | tuna: kernel prebuiltBenoit Goby2012-07-241-0/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 396c4df Toro: Update USB gadget for DM feature Bug: 6829107 Change-Id: I8a33a3fae8bf7eb4e6c19f327f0f9b70ed056fa0
* | | | | | tuna: kernel prebuiltDmitry Shmidt2012-07-271-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6a34c5 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 5696a46 Merge branch 'android-3.0' into android-omap-3.0 e463932 net: wireless: bcmdhd: Fill station_info packet fields 62618c1 net: wireless: bcmdhd: Prevent HT Avail request failure to flood the log 3421d0b net: wireless: bcmdhd: Use proper jiffie-related functions c491722 net: wireless: bcmdhd: Adjust driver/fw/chip info format b595a66 x86: Call idle notifiers 66943ea net: wireless: bcmdhd: Add info_string param with driver/fw/chip info f4702ad net: wireless: bcmdhd: Remove country update from wl_update_wiphybands a5c77fe net: wireless: bcmdhd: Fix P2P GO hang issue df06df7 net: wireless: bcmdhd: Update wiphy bands on band change 230efa6 net: wireless: bcmdhd: Init locks in dhd_attach() at the beginning f70624b net: wireless: bcm4329: Init locks in dhd_attach() at the beginning fa98f04 net: wireless: bcmdhd: Add mutex to wl_update_wiphybands() 22baf5d net: wireless: bcmdhd: Skip country setting if unnecessary 6898353 net: wireless: bcmdhd: Return wl_construct_reginfo() call d7ade6c net: wireless: bcmdhd: Add wiphyband update for country change 38fac5b net: wireless: bcmdhd: Skip inaccurate wl_construct_reginfo() call 562490d net: wireless: bcmdhd: Ignore error if "chanspecs" command is not supported 1ed2a48 net: wireless: bcmdhd: Reduce priority for dhd_dpc and watchdog 2749b2e net: wireless: bcmdhd: Reload FW in case of constant scan failure BUG: b/6874044, b/6404900, b/6815371 Change-Id: Ic6c58b96c2c3b131612a6784433347d4b9a8cdee Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | | am 1a377cba: Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-190-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit '1a377cbaafba4e60d8408d83b9444a1a8f5caa7f':
| * | | | | Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-190-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | Change-Id: Ifec547b3abb47c514f60a41d588a916b9bc43dd5
| | * | | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-170-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| |
* | | | | tuna: dumpstate: Add wlan info dumpDmitry Shmidt2012-07-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id1ddc016164e8b0617b70a27175bc77f13970f9c Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | Merge "added bt-pan network interface for tethering"Matthew Xie2012-07-161-1/+1
|\ \ \ \ \
| * | | | | added bt-pan network interface for tetheringzzy2012-07-131-1/+1
| | | | | |
* | | | | | Merge "Add bthid device driver ko file. Init it as device driver node. ↵Matthew Xie2012-07-163-0/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Author: Priti Aghera"
| * | | | | Add bthid device driver ko file. Init it as device driver node.Matthew Xie2012-07-133-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: Priti Aghera Change-Id: Iae05cfeca4a02755594c1276135b5aa737c90004
* | | | | | am b7065fec: am 32c13ca6: tuna: kernel prebuiltBenoit Goby2012-07-161-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * commit 'b7065fec81586f45311595d0822362e73bea8882': tuna: kernel prebuilt
| * | | | am 32c13ca6: tuna: kernel prebuiltBenoit Goby2012-07-161-0/+0
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | * commit '32c13ca6d861b55c78e92329ba9ae6f5363fd1bd': tuna: kernel prebuilt
| | * | tuna: kernel prebuiltBenoit Goby2012-07-161-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 396c4df Toro: Update USB gadget for DM feature Bug: 6829107 Change-Id: I8a33a3fae8bf7eb4e6c19f327f0f9b70ed056fa0
generated by cgit v1.1 at 2024-06-30 12:02:35 +0000