summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am f5bee2d8: am 6305434b: Merge "tuna: add headset jack key layout files" ↵Dima Zavin2012-01-193-1/+35
|\ | | | | | | | | | | | | into ics-mr1 * commit 'f5bee2d844424fceab84dff73ba97001449bfa96': tuna: add headset jack key layout files
| * am 6305434b: Merge "tuna: add headset jack key layout files" into ics-mr1Dima Zavin2012-01-183-1/+35
| |\ | | | | | | | | | | | | * commit '6305434b1f2d1456c823ebd49335ca8a50ef76e2': tuna: add headset jack key layout files
| | * Merge "tuna: add headset jack key layout files" into ics-mr1Dima Zavin2012-01-183-1/+35
| | |\
| | | * tuna: add headset jack key layout filesDima Zavin2012-01-183-1/+35
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic47caa03b2927f405784b25cbd550739f2d2daa9 Signed-off-by: Dima Zavin <dima@android.com>
* | | | Merge "Turn off execute bit"Glenn Kasten2012-01-193-0/+0
|\ \ \ \
| * | | | Turn off execute bitGlenn Kasten2012-01-183-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I711920dde1560ca202ef878ee93a2af61545524b
* | | | | tuna: prebuilt kernelTodd Poynor2012-01-181-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 277d449 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 53899a5 Merge branch 'linux-omap-3.0' into android-omap-3.0 e4f77ac OMAP4: Clock: Force a DPLL clkdm/pwrdm ON before a relock a37a070 omap4: tuna: Drop soft lockup detector timeout to 10 secs d6b6066 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 7b85fb2 Merge branch 'linux-omap-3.0' into android-omap-3.0 8f88cb4 Merge branch 'android-3.0' into android-omap-3.0 817c7dd OMAP4: PM: work around for CPU1 onlining from OFF/OSWR state on older PPA 3966f20 OMAP3+: PM: VC: vcbypass needs to wait for valid to clear 24086fd OMAP4: PM: TPS6236x: speed up voltage rampup rate dd6f160 OMAP4: PM: TPS6236x: ensure rampdown occurs fast on shutdown 74ab8f9 OMAP4460: TWL6030: Setup VDD_core OFF voltage to retention voltage 2abeb4e OMAP4: TWL: ensure PREQ1 results in all active VCOREs to be down 5e72576 OMAP4: HWMOD: UART1: disable smart-idle. d5c22ce misc: fsa9480: don't enable FSA IRQ when VBUS IRQ is enabled 30e477c ASoC: DSP: Split runtime startup/shutdown updates 9eac901 ASoC: dsp - BE disconnection after pending flag is clear 05c3e8d misc: modem_if: link_mipi: Reset mipi phy when receive wrong packet e90972c Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 98d7473 Merge branch 'linux-omap-3.0' into android-omap-3.0 d6ce9ce omap4: prcm debug: Fix l4sec clkactivity bits bde38ac omap4: prcm debug: Fix l4sec clkactivity bits 7f5ab75 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 c67df04 Merge branch 'linux-omap-3.0' into android-omap-3.0 3896b63 omap: dispc: force L3_2 CD to NOSLEEP when dispc module is active a65e28a ram_console: set CON_ANYTIME console flag 34b2ec0 power: max17040: do a sanity check in the fuel alert handler Change-Id: Ie363ab663b0da14b69b308a901d7c184192290a7 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* | | | | resolved conflicts for merge of 7e5c4af7 to masterBenoit Goby2012-01-182-2/+12
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / Change-Id: I2aaed3c8b7e32b33beca0632eb4313894666195b
| * | | am 7d8d7451: Toro: USB: Add RNDIS+DM+MODEMsujin119.kim2012-01-182-2/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '7d8d74514dbf908018307852a50e80f671beeee6': Toro: USB: Add RNDIS+DM+MODEM
| | * | Toro: USB: Add RNDIS+DM+MODEMsujin119.kim2012-01-172-2/+12
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Add RNDIS+DM+MODEM for CP logging 1. Add USB composite setting for RNDIS+DM+MODEM 2. Change the permission for ttyGS0 Change-Id: Ifec615a33b7bb2c3e64098525f968a9026ff14c4 Signed-off-by: sujin119.kim <sujin119.kim@samsung.com>
* | | Merge "Use audio_mode_t consistently"Glenn Kasten2012-01-171-2/+2
|\ \ \
| * | | Use audio_mode_t consistentlyGlenn Kasten2012-01-121-2/+2
| | | | | | | | | | | | | | | | Change-Id: I7a30fe3f66933aed8b5a6185553112575b4de1a7
* | | | am a9d4dc4d: am efc0ff3c: Merge "Move toro spr files to torospr." into ics-mr1Jeff Davidson2012-01-131-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'a9d4dc4d372e1bcaea55988546d8334623134d56': Move toro spr files to torospr.
| * | | am efc0ff3c: Merge "Move toro spr files to torospr." into ics-mr1Jeff Davidson2012-01-131-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'efc0ff3c3ba2d94be17e423a95e27617eb3e9e45': Move toro spr files to torospr.
| | * | Merge "Move toro spr files to torospr." into ics-mr1Jeff Davidson2012-01-131-1/+1
| | |\ \
| | | * | Move toro spr files to torospr.Jeff Davidson2012-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes toro recovery visible to torospr. Change-Id: I1de6e0d14c8e1642d1a1105612db72eddbb70508
* | | | | am 73a4cc97: (-s ours) am d007e239: tuna: prebuilt kernel -- DO NOT MERGETodd Poynor2012-01-130-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '73a4cc97e14d55724ede3d558f6b8a614cd9f664': tuna: prebuilt kernel -- DO NOT MERGE
| * | | | am d007e239: tuna: prebuilt kernel -- DO NOT MERGETodd Poynor2012-01-131-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'd007e23939cbb8484eea96234a4f356208842c63': tuna: prebuilt kernel -- DO NOT MERGE
| | * | | tuna: prebuilt kernel -- DO NOT MERGETodd Poynor2012-01-131-0/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ebb62b usb: musb: Add a BUG_ON if trying to suspend musb in B_IDLE state 098e128 omap: dispc: force L3_2 CD to NOSLEEP when dispc module is active 0e4741f net: wireless: bcmdhd: Fix proper scan command even if request is NULL 8e56dbd net: wireless: bcmdhd: Fix scan crash in ibss mode 5e53345 power: max17040: do a sanity check in the fuel alert handler Change-Id: Iaa5ec8b3cc4f8b57e9797a9f56ec2cd25192b832 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* | | | tuna: convert all usages of $prop to ${prop}Dima Zavin2012-01-122-19/+19
| |_|/ |/| | | | | | | | | | | Change-Id: If89041802cb2b8e927794b269564e7982e5dcdcf Signed-off-by: Dima Zavin <dima@android.com>
* | | Merge "Create /data/radio directory in post-fs-data section"Ken Sumrall2012-01-111-2/+3
|\ \ \
| * | | Create /data/radio directory in post-fs-data sectionKen Sumrall2012-01-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All files/directories created by init*.rc in /data must be done in the post-fs-data section, otherwise they won't get created if the device is encrypted with wipe. Change-Id: I456632800daf3f63d42924de911d7c143c16d8ea
* | | | tuna: wifi: Remove obsolete wifi.supplicant_scan_intervalDmitry Shmidt2012-01-101-2/+1
|/ / / | | | | | | | | | | | | Change-Id: Ic37712504a0a0d296a7258cddde70cbc926b8c13 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | Merge "add sideload-from-adb command to recovery menu"Doug Zongker2012-01-101-4/+6
|\ \ \
| * | | add sideload-from-adb command to recovery menuDoug Zongker2012-01-091-4/+6
| | | | | | | | | | | | | | | | Change-Id: Ic94970a9a1ea2e452f2bb55dd516d5ec78cda9de
* | | | new kernel prebuiltErik Gilling2012-01-091-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: b611eab Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 101af9a Merge branch 'android-3.0' into android-omap-3.0 af3cbc6 OMAP4: dss2: make s6e8aa0 pixel_clock reflect reality 84e02c2 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 281033a Merge branch 'linux-omap-3.0' into android-omap-3.0 fd6e929 OMAP4: HDCP: Disable HDCP authentication for incorrect AKSV values 2ea1605 Revert "HACK: video: ti_hdmi: print warning on invalid AKSV" a8397e2 OMAP4: Clock: Put USB_DPLL in stop low power mode explicitly 77c3bbb OMAP4: Clock: Correct OTG clock to use otg_60m_gfclk. f16e6fb Revert "usb: gadget: rndis: don't use dev_get_stats" e1493f1 net: wireless: bcmdhd: Enable wlan access on resume for all sdio functions bbd08c6 net: wireless: bcmdhd: Fix P2P interface removal 37ff441 net: wireless: bcm4329: Fix pno_enable if disassociated 599c856 net: wireless: bcmdhd: Fix proper scan command even if request is NULL f227b88 net: wireless: bcmdhd: Decrease event wake_lock timeout to 1500 ms ed3f356 net: wireless: bcmdhd: Fix getting arp_hostip table c561ced net: wireless: bcmdhd: Allow to push more packets to FW for Tx 4f36cb8 net: wireless: bcmdhd: Fix scan crash in ibss mode af16732 net: wireless: bcmdhd: Add FW reloading in case of FW hang 7caeacd net: wireless: bcmdhd: Update to Version 5.90.125.94.1 8d71d88 net: wireless: bcmdhd: Use CONFIG_DHD_USE_STATIC_BUF for preallocated memory 3504720 wireless: Protect regdomain change by mutex ea693bf mmc: Set suspend/resume bus operations if CONFIG_PM_RUNTIME is used dc1b634 usb: gadget: android: Don't allow changing the functions list if enabled Change-Id: Ic2206c6295ad1b76fff88f7d87bb4c101e7c362b Signed-off-by: Erik Gilling <konkers@android.com>
* | | | Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE"Steve Block2012-01-095-27/+27
|\ \ \ \
| * | | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-085-27/+27
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: I2e1c43800c19b718cc7ee94ec299c62bc14873b4
* | | | Require bootloader PRIMELA01Paul Eastham2012-01-091-1/+1
|/ / / | | | | | | | | | Change-Id: Id7fa96a129701bc9f62384d582c1545504bb33ef
* | | am c3cf026f: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-060-0/+0
|\ \ \ | |/ / | | | | | | * commit 'c3cf026f65d36c8c0e5d64b93127969e06be1627':
| * | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-060-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: I9f611c8227b218fae511491e171cf4e1a18b4256
| | * \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-060-0/+0
| | |\ \ | | | |/ | | |/|
* | | | am 58467df8: am 8c18bf4b: Merge "tuna: update touch firmware to vers ↵Dima Zavin2012-01-062-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 0x65/0x45" into ics-mr1 * commit '58467df84ad67c0b574649bdc5fd4d5197e4aa0c': tuna: update touch firmware to vers 0x65/0x45
| * | | am 8c18bf4b: Merge "tuna: update touch firmware to vers 0x65/0x45" into ics-mr1Dima Zavin2012-01-062-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '8c18bf4bdfeb4479f6ef8470050a6a204ef333bc': tuna: update touch firmware to vers 0x65/0x45
| | * | Merge "tuna: update touch firmware to vers 0x65/0x45" into ics-mr1Dima Zavin2012-01-062-0/+0
| | |\ \
| | | * | tuna: update touch firmware to vers 0x65/0x45Dima Zavin2012-01-062-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0x65 is for rev3.2 touch panels, and 0x45 is for rev3.1 To resolve multi-touch issue, 1. Added debounce algorithm on switching mode at noisy environment. 2. Added hysteresis on rejecting events at noisy state, to prevent frequent drop of events and to improve usability. Change-Id: I62791274bb5e59ef2cf3300977da205c9914aaee
* | | | | am 9731389e: am 1c8aebba: am 726553e5: Tool to fix the fs_size in the crypto ↵Ken Sumrall2012-01-063-1/+74
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | footer * commit '9731389e0b560c9fd9c0c86c6ebd7b64393a3f7d': Tool to fix the fs_size in the crypto footer
| * | | | am 1c8aebba: am 726553e5: Tool to fix the fs_size in the crypto footerKen Sumrall2012-01-063-1/+74
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '1c8aebba2f6eb730254d1232f14d8dbb38990744': Tool to fix the fs_size in the crypto footer
| | * | | am 726553e5: Tool to fix the fs_size in the crypto footerKen Sumrall2012-01-063-1/+74
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '726553e5ce617056aff3796ef320b76db245ee67': Tool to fix the fs_size in the crypto footer
| | | * | Tool to fix the fs_size in the crypto footerKen Sumrall2012-01-053-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GPT of HSPA Prime devices is incorrect when it comes from the factory. Flashing a new bootloader fixes the GPT, but if the user had already encrypted the device, the old size of the partition is recorded in the crypto footer. If the size if not updated, the device will not be able to boot after the OTA, so add a new command to fix the fs_size field in the crypto footer for Prime devices. Change-Id: Ied4b592973d3d5c36c478b7fb32d59ac9e9611b0
* | | | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I02cfaca251935e4a50ad4302a72c4273be41db22
* | | | | am 7950c668: am 31e70cf1: tuna: new kernel prebuiltBenoit Goby2012-01-051-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '7950c6689bafa8fce07aa79fd327d7c705472247': tuna: new kernel prebuilt
| * | | | am 31e70cf1: tuna: new kernel prebuiltBenoit Goby2012-01-051-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '31e70cf182d5b834acf92ba7eabd780ce4bcc55d': tuna: new kernel prebuilt
| | * | | tuna: new kernel prebuiltBenoit Goby2012-01-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e00d9bd mmc: Set suspend/resume bus operations if CONFIG_PM_RUNTIME is used d795e3c OMAP4: Clock: Put USB_DPLL in stop low power mode explicitly 1493e09 OMAP4: Clock: Correct OTG clock to use otg_60m_gfclk. Change-Id: Ib2e5b7bf14f8f297d6953ee9b79c0141ff7075dc
* | | | | am f3c14a24: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-200-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | * commit 'f3c14a2491db11a4013de0bcd41e59cc0fc75917':
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-200-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | Change-Id: Id951df2de72354f5dea7ad541824538c0242cd7e
| | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-160-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | Remove libaudioutils, now in coreGlenn Kasten2011-12-161-2/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I78f3e6476665b4ff211642299ba956b18d2cf5a8
* | | | | am cf903c0e: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-160-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | * commit 'cf903c0eaa7273e8b31cb57eb346a103219470b4':
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-160-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: Ifb9d8e9321f4089f98600b8813016735a2b3131f
generated by cgit v1.1 at 2024-06-29 15:46:28 +0000