summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | tuna: prebuilt kernel (HSMMC1 suspend fix)Todd Poynor2012-08-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed3fbf9 Revert "OMAP4: hsmmc: fix race conditions in suspend/resume path" Change-Id: I8c169fe4a92d3952fb83e2b99c374b626f9242d2 Conflicts: kernel
| | * | | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-08-160-0/+0
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
* | | | | | am ab40b025: (-s ours) am 5fa370b1: tuna: prebuilt kernel (USB audio use ↵Todd Poynor2012-08-160-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after free) -- DO NOT MERGE * commit '462e9bec7276cd2387fca416e1c67cd26055ba49': tuna: prebuilt kernel (USB audio use after free) -- DO NOT MERGE
| * | | | | am 5fa370b1: tuna: prebuilt kernel (USB audio use after free) -- DO NOT MERGETodd Poynor2012-08-160-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '2b772f6cfdd9c1fb64707f420b75db4dbc417c99': tuna: prebuilt kernel (USB audio use after free) -- DO NOT MERGE
| | * | | | tuna: prebuilt kernel (USB audio use after free) -- DO NOT MERGETodd Poynor2012-08-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d17245c USB: gadget: f_audio_source: Fix compilation error 7f30487 USB: gadget: f_audio_source: Fix use after free in audio_unbind Change-Id: I86f390b66a49cf53a484247ba9b61ef2ab9e2c0f
* | | | | | Merge "tuna: prebuilt kernel (USB HID, USB audio fix, MMC suspend fixes)" ↵Todd Poynor2012-08-160-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev
| * | | | | | tuna: prebuilt kernel (USB HID, USB audio fix, MMC suspend fixes)Todd Poynor2012-08-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8fae35c Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 2dfc945 Merge branch 'linux-omap-3.0' into android-omap-3.0 1062dd1 Merge branch 'android-3.0' into android-omap-3.0 16f1d42 USB: gadget: f_audio_source: Fix compilation error 54c7c33 USB: gadget: f_audio_source: Fix use after free in audio_unbind d4bad8b HID: uhid: Fix sending events with invalid data db58898 HID: uhid: silence gcc warning d33f92d MAINTAINERS: add UHID entry 9634f81 HID: uhid: add example program bd76675 HID: uhid: add documentation c12e46f HID: uhid: implement feature requests 715ee7c HID: uhid: forward raw output reports to user-space bd46634 HID: uhid: forward output request to user-space e458139 HID: uhid: forward open/close events to user-space 245fd8c HID: uhid: add UHID_START and UHID_STOP events 6645460 HID: uhid: forward hid report-descriptor to hid core e0ad830 HID: uhid: allow feeding input data into uhid devices 6b1a4c7 HID: uhid: add UHID_CREATE and UHID_DESTROY events d3444a8 HID: uhid: implement write() on uhid devices b8dd3d9 HID: uhid: implement read() on uhid devices 191b032 HID: uhid: allow poll()'ing on uhid devices ef5006b HID: uhid: add internal message buffer 4409981 HID: uhid: introduce user-space I/O driver support for HID 392f3a3 OMAP4: hsmmc: fix race conditions in suspend/resume path efadaa2 mmc: Make sure host is disabled on suspend Change-Id: I55ec9aad5a629335bf9506538557f87ca4742d10
* | | | | | | Multi-user external storage support.Jeff Sharkey2012-08-161-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move FUSE daemon to secure mount point, and relax /storage access now that sdcard_r is enforced using private bind mounts in zygote. Bug: 6925012 Change-Id: I6c3b54e07a176408053749de6966b26c9f58bb5f
* | | | | | | Merge "tuna: prebuilt kernel (HSMMC1 suspend fix)" into jb-mr1-devTodd Poynor2012-08-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | tuna: prebuilt kernel (HSMMC1 suspend fix)Todd Poynor2012-08-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d8fd18 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 27ca401 Merge branch 'linux-omap-3.0' into android-omap-3.0 88e85fa Merge branch 'android-3.0' into android-omap-3.0 a15bf22 Revert "OMAP4: hsmmc: fix race conditions in suspend/resume path" 11c327f net: wireless: bcm4329: Remove obsolete files Change-Id: I310b1c46e096d643314d289aaef6c6a5aa08ebea
* | | | | | | am d008e8a3: (-s ours) am 6b6fdeb4: tuna: prebuilt kernel (HSMMC1 suspend fix)Todd Poynor2012-08-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * commit 'ea15dbfc61f631aa4a107884f9b288decd54515f': tuna: prebuilt kernel (HSMMC1 suspend fix)
| * | | | | am 6b6fdeb4: tuna: prebuilt kernel (HSMMC1 suspend fix)Todd Poynor2012-08-150-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '8649b08a023de9db91c655e19867469868215490': tuna: prebuilt kernel (HSMMC1 suspend fix)
| | * | | | tuna: prebuilt kernel (HSMMC1 suspend fix)Todd Poynor2012-08-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed3fbf9 Revert "OMAP4: hsmmc: fix race conditions in suspend/resume path" Change-Id: I8c169fe4a92d3952fb83e2b99c374b626f9242d2
* | | | | | use bsdiff not imgdiff to compute radio diffsDoug Zongker2012-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib4f81eaf0e5229ea2a1c8662479780fafead7231
* | | | | | 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-130-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 '68db7145bc037cdc14cb0a5ed9354de5448d87e4': Fix build - Add TARGET_ARCH := arm
| * | | | | am 18c08871: Merge "Fix build - Add TARGET_ARCH := arm"Jean-Baptiste Queru2012-08-101-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b811c342091ade155a23487649b27b6627d319be': 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-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0b29d969cfbc8c0432ebee7a1d51da666f53b508. Bug: 6951799
* | | | | | | prebuilt kernel (DDK 1.9RC1, usb gadget,...)JP Abgrall2012-08-070-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 '338944205dbc07f3c0cdf0448e61da2a4435b31c':
| * | | | | | 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 'cf723f6ccbd163ad13833b9c2b3ca66f3e320c9c': tuna: kernel prebuilt DO NOT MERGE
| * | | | | | am b69d5d1b: tuna: kernel prebuilt DO NOT MERGEMike Lockwood2012-08-060-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '4d159355acd2b5de0619127bda9e78f612e02ebd': tuna: kernel prebuilt DO NOT MERGE
| | * | | | | tuna: kernel prebuilt DO NOT MERGEMike Lockwood2012-08-040-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 '15be69c700abbeb7aca6768cd019b06b1c838f6e': add permissions to dev/cdam_cplog
| * | | | | | am de5687d9: Merge "add permissions to dev/cdam_cplog"Wink Saville2012-08-041-0/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit '4a58fbc3f2112081aeab8293d61662306e28092f': 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 '745864a13a3548610c887da27d6cc8755a4d9eb8': 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-030-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 '2b8a146ec8c7420bfe720d5d9b38fa63dbab42e7': add toroplus to the recovery target
| * | | | | | | am 2c119692: Merge "add toroplus to the recovery target"Jean-Baptiste Queru2012-08-021-1/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '156aee869d3e5cf629b930ddd719adf83956ba08': 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 'b09c76708a7a929e9ec08607fbc2f71d552aab98': 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-240-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-240-0/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 396c4df Toro: Update USB gadget for DM feature Bug: 6829107 Change-Id: I8a33a3fae8bf7eb4e6c19f327f0f9b70ed056fa0
* | | | | | tuna: kernel prebuiltDmitry Shmidt2012-07-270-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 '5dc85de25035c4155f423d4c84d35cdd253ed6bd':
generated by cgit v1.1 at 2025-01-21 21:57:12 +0000