summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-09-120-0/+0
|\ | | | | | | Change-Id: Ieda80a0e02948eae77ef3dc271aac8bc3111fee8
| * tuna: Kernel prebuiltDmitry Shmidt2012-09-101-0/+0
| | | | | | | | | | | | | | | | | | 4f6d371 net: wireless: bcmdhd: Report proper mcs rate mask BUG: b/7103180 Change-Id: Icd315e735cc7ca3e6519af6a216c718280ced292 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | am 5bc53d51: rename torospr to toroplusMadan Ankapura2012-09-120-0/+0
|\ \ | | | | | | | | | | | | * commit '5bc53d51b5594b748880b3c5b12cd9ac635b2c8b': rename torospr to toroplus
| * | rename torospr to toroplusMadan Ankapura2012-09-111-1/+1
| | | | | | | | | | | | | | | | | | Bug: 6940653 Change-Id: I4cf7cc5a9f4acdc53f1d1ec13c586faf448d6645 Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
* | | am adca85d2: tuna: Kernel prebuiltDmitry Shmidt2012-09-101-0/+0
|\| | | | | | | | | | | | | | * commit 'adca85d21828c33c277f1e27e1f31a5d8a2d30e9': tuna: Kernel prebuilt
| * | tuna: Kernel prebuiltDmitry Shmidt2012-09-101-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | 4f6d371 net: wireless: bcmdhd: Report proper mcs rate mask BUG: b/7103180 Change-Id: Icd315e735cc7ca3e6519af6a216c718280ced292 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | Reconcile with jb-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
|\ \ \ | | | | | | | | | | | | Change-Id: I9328881b4ad7f1616c24abc040a9d7e702829a23
| * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-08-290-0/+0
| |\ \ \
| | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-08-290-0/+0
| | |\ \ \ | | |/ / / | |/| | |
| | | | |
| \ \ \ \
*-. | | | | Reconcile with jb-mr0-release jb-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
|\ \| | | | | | |_|_|/ | |/| | | | | | | | Change-Id: I0a4cbc45069630a6cfee2647e58fbdeee4f37a94
| | * | | tuna: prebuilt kernel (HSMMC1 suspend fix)Todd Poynor2012-08-161-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 5fa370b1: tuna: prebuilt kernel (USB audio use after free) -- DO NOT MERGETodd Poynor2012-08-161-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '5fa370b1f3774ae3d38a98fffa23528cc4ac4068': tuna: prebuilt kernel (USB audio use after free) -- DO NOT MERGE
| * | | | tuna: prebuilt kernel (USB audio use after free) -- DO NOT MERGETodd Poynor2012-08-161-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
* | | | | am 6b6fdeb4: tuna: prebuilt kernel (HSMMC1 suspend fix)Todd Poynor2012-08-151-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '6b6fdeb47f67b5931ae5b369bc9b62e82bd12b8c': tuna: prebuilt kernel (HSMMC1 suspend fix)
| * | | | tuna: prebuilt kernel (HSMMC1 suspend fix)Todd Poynor2012-08-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed3fbf9 Revert "OMAP4: hsmmc: fix race conditions in suspend/resume path" Change-Id: I8c169fe4a92d3952fb83e2b99c374b626f9242d2
* | | | | 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
* | | | | | 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 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 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>
* | | | | | | 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 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>
* | | | | | 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
* | | | | 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
| |\| | | | | |_|/ | |/| |
* | | | 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
* | | Reconcile with jb-releaseThe Android Open Source Project2012-06-290-0/+0
|\ \ \ | | |/ | |/| | | | Change-Id: I49979559bbfacac4301e4f6ed2b6217f40c9cf72
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-280-0/+0
| |\ \ | | |/ | |/|
* | | am cc170b73: tuna: kernel prebuiltDmitry Shmidt2012-06-281-0/+0
|\| | | | | | | | | | | | | | * commit 'cc170b73763f7364030d4fada8f5ac11c511a4ed': tuna: kernel prebuilt
| * | tuna: kernel prebuiltDmitry Shmidt2012-06-281-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6fb96c9 net: wireless: bcmdhd: Skip inaccurate wl_construct_reginfo() call 0476d43 net: wireless: bcmdhd: Ignore error if "chanspecs" command is not supported BUG: b/6749594 Change-Id: I927c3d0d19bf82a88e4bca0dfd39c6012d773141 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | Reconcile with jb-releaseThe Android Open Source Project2012-06-200-0/+0
|\ \ \ | | |/ | |/| | | | Change-Id: I99f4af163b8e127c455274b1493ae2ef35b6bd0f
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-200-0/+0
| |\ \ | | |/ | |/|
* | | am d0bb9493: tuna: prebuilt kernelGreg Hackmann2012-06-191-0/+0
|\| | | | | | | | | | | | | | * commit 'd0bb94930a9ddcf978af08bc06af24b2abafd483': tuna: prebuilt kernel
| * | tuna: prebuilt kernelGreg Hackmann2012-06-191-0/+0
| | | | | | | | | | | | | | | | | | | | | e8de0e2 video: sii9234: dynamically register and unregister input device Change-Id: I422a35aa26510b3ec385153302b4e4a4fbdcf7b3 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ \ | | |/ | |/| | | | Change-Id: I000a8fa2568425ea21fb03d9fc1b01391eeb0d5a
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-190-0/+0
| |\ \ | | |/ | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-16 00:04:46 +0000