summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | | 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>
| * | | | | | | | | | | | | | | audio: fix string leakage in out_get_parameters()Eric Laurent2012-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out_get_parameters() was calling strdup() on the string returned by str_parms_to_str() before returning it to the caller. This creates a new string which is never freed as str_parms_to_str() already allocates a new string. Change-Id: I4bcc4aa17ab55e830d7a0569151f717422f6459b
| * | | | | | | | | | | | | | | Merge "tuna: Kernel prebuilt" into jb-mr1-devDmitry Shmidt2012-09-071-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | tuna: Kernel prebuiltDmitry Shmidt2012-09-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95b8c1c Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 ab5f2d3 Merge branch 'android-3.0' into android-omap-3.0 6a5fe81 net: wireless: bcmdhd: Report proper mcs rate mask Change-Id: I765d09d50940cef2b927359cc1bb6a8fc3f23332 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| * | | | | | | | | | | | | | | | audio: changes for new audio device enumsEric Laurent2012-09-061-69/+43
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifications for new audio device enums: - Separated input and output device fields as output and input device values are now on 32 bits. - Changed audio device API version to 2.0 Also removed get_supported_devices() function not needed if audio_policy.conf file is present. Change-Id: I41b782e7450b4664048cc484a681b9327d8395da
| * | | | | | | | | | | | | | | Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-devJeff Sharkey2012-09-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Bring back ADB_EXTERNAL_STORAGE.Jeff Sharkey2012-09-061-0/+1
| | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7119408 Change-Id: Ia08146965ee6218a033a70c2f02cbc621e339316
| * | | | | | | | | | | | | | | am 560e7fdf: (-s ours) Reconcile with jb-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / * commit '560e7fdf40497c8d705d173ecc6ef40e9305c5f5':
| | * | | | | | | | | | | | | 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
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Remove /sdcard hack for shell users.Jeff Sharkey2012-09-051-1/+1
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using a /storage/sdcard0 symlink and a tmpfs staging area was used to enable "/sdcard" paths for both zygote processes and the shell user, but it breaks on devices with both emulated and physical external storage. Specifically, vold can't mount a physical sdcard onto the primary storage symlink, and zygote can't re-bind-mount when secondary storage is remounted after dropping privileges. Bug: 7094858, 7064600 Change-Id: Ic9821129f94c22d0c64e84d8ee9f55d505a78e5d
| * | | | | | | | | | | | | | | Merge "make_ext4fs has moved to build/target/core.mk" into jb-mr1-devKenny Root2012-08-301-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | make_ext4fs has moved to build/target/core.mkKenny Root2012-08-301-1/+0
| | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to add make_ext4fs to each device since it's in build/target/core.mk since commit 720479ea7e6307648c56f61d82ac12d65f218dda Bug: 6960586 Change-Id: I916b06e9d696764d1944d3c911ab75f4ef34fb7d
| * | | | | | | | | | | | | | | audio: fix echo reference channels configurationEric Laurent2012-08-301-1/+1
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an auxiliary mic channel is used, the echo reference should use only the main channels to be consistent with the way the reverse effect processing is configured. Change-Id: I28ee1e2a9852fdd0e904fb01bedf90f3372683c9
| * | | | | | | | | | | | | | tuna: prebuilt kernel (netfilter, wifi)Todd Poynor2012-08-281-0/+0
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 581b972 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 439b66b Merge branch 'android-3.0' into android-omap-3.0 1dfbc28 netfilter: xt_qtaguid: report only uid tags to non-privileged processes ddb45c7 net: wireless: bcmdhd: Fix sending ctrl packet d7cdb87 net: wireless: bcmdhd: Add ASSOC event processing Change-Id: Ic0cd79adbcb9bfbf0882e41270cb950ce5b260fa
| * | | | | | | | | | | | | tuna: kernel prebuiltDmitry Shmidt2012-08-271-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63535ce Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 bf7dde6 Merge branch 'android-3.0' into android-omap-3.0 8b056dd net: wireless: bcmdhd: Update to version 5.90.195.104 26ae87e cfg80211: allow registering to beacons 8234215 nl80211: add API to probe a client eef4c1e nl80211: allow subscribing to unexpected class3 frames 6c3e830 nl80211: advertise device AP SME 1bd42d5 nl80211: advertise GTK rekey support, new triggers e350606 nl80211: support sending TDLS commands/frames 931201c cfg80211/nl80211: Add PMKSA caching candidate event 97ce108 cfg80211/nl80211: support GTK rekey offload eca0e76 net: wireless: bcmdhd: Remove WIPHY_FLAG_SUPPORTS_FW_ROAM flag 50701ac net: wireless: bcmdhd: Remove PMKID_CACHE and TXFAIL events for CFG80211 c0ff1e2 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 fde9052 Merge branch 'android-3.0' into android-omap-3.0 eb3cd50 net: wireless: bcmdhd: Update to Version 5.90.195.98 Change-Id: I44d8534ace1aba594c33fb80f2db855bc42560ef Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| * | | | | | | | | | | | | Use 3 ms buffers for low latency pathGlenn Kasten2012-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icf113e2e863a79cb3d870fac5781539702cdbfa8
| * | | | | | | | | | | | | Merge "Triple buffer if SRC enabled" into jb-mr1-devGlenn Kasten2012-08-271-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Triple buffer if SRC enabledGlenn Kasten2012-08-211-0/+7
| | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6881638 Change-Id: I76255c2cd5845671c2342e22932c692342257208
| * | | | | | | | | | | | Iteration on multi-user external storage.Jeff Sharkey2012-08-221-5/+4
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symlink to make /sdcard work for shell users. Environment variable to find root of multiuser SD card. Bug: 6925012 Change-Id: Ia190a609a3b04357a7acb8fe630971bb13aab249
| * | | | | | | | | | | Merge "Add support for per device bluetooth configuration." into jb-mr1-devWink Saville2012-08-202-1/+26
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add support for per device bluetooth configuration.Wink Saville2012-08-202-1/+26
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6837125 Change-Id: I3c05e57703c02bb9981bd4628347cc7e3b060574
| * | | | | | | | | | | tuna: prebuilt kernel (shutdown hang)Todd Poynor2012-08-201-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 313293e Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 f87901e Merge branch 'android-3.0' into android-omap-3.0 8f4d8bd ARM: disable preemption in machine_shutdown Change-Id: I4c2a5033c55c712c618397454f39b57048229edd
| * | | | | | | | | | | Revert "Add bthid device driver ko file. Init it as device driver node."Matthew Xie2012-08-203-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UHID device in kernel is used instead of this driver. This reverts commit b5f88903c387b208629bcc04aad2c92f242e4144.
| * | | | | | | | | | | Merge "Migrate sdcard0 to shell-accessible location." into jb-mr1-devJeff Sharkey2012-08-201-3/+7
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Migrate sdcard0 to shell-accessible location.Jeff Sharkey2012-08-201-3/+7
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7005701 Change-Id: I0c07505d9ccc2842186a00a4e96489063cc8c7e8
| * | | | | | | | | | | Merge "tuna: prebuilt kernel" into jb-mr1-devBenoit Goby2012-08-201-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | tuna: prebuilt kernelBenoit Goby2012-08-201-0/+0
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 307b3aa1 misc: modem_if: link_mipi: add message break command recovery b19fa08 misc: modem_if: link_mipi: fix the missing of initialize recv_step for next rx 7152ad3 ARM: omap4: tuna: enable CONFIG_UHID in defconfig Bug: 6768080 Change-Id: I6bc602813c65e71ca0adfcf162a415d03233e237
| * | | | | | | | | | | Remove android.software.live_wallpaper.xml from PRODUCT_COPY_FILESYing Wang2012-08-201-3/+0
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7019907 Change-Id: I5248e0b0522bc688e4f77a59672590ba298de3e5
| * | | | | | | | | | am ef53876e: (-s ours) Reconcile with jb-mr0-release jb-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ef53876e81367a2f10946bda35ff0e0f62fd5b56': tuna: prebuilt kernel (HSMMC1 suspend fix)
| | | | | | | | | | |
| | | \ \ \ \ \ \ \ \
| | *-. \ \ \ \ \ \ \ \ 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 ab40b025: (-s ours) am 5fa370b1: tuna: prebuilt kernel (USB audio use ↵Todd Poynor2012-08-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after free) -- DO NOT MERGE * commit 'ab40b02561b34c6fb0c85fc1be9a62a79e7ccd4e': 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-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
| * | | | | | | | | | Merge "tuna: prebuilt kernel (USB HID, USB audio fix, MMC suspend fixes)" ↵Todd Poynor2012-08-161-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev
| | * | | | | | | | | | tuna: prebuilt kernel (USB HID, USB audio fix, MMC suspend fixes)Todd Poynor2012-08-161-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-151-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | tuna: prebuilt kernel (HSMMC1 suspend fix)Todd Poynor2012-08-141-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 'd008e8a3a1c73566ffb263cf072eb02ac0503794': tuna: prebuilt kernel (HSMMC1 suspend fix)
| | * | | | | | | | 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
| * | | | | | | | | 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-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