summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | | 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>
* | 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 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>
* | 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 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 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
* | | | 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
* | | | 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
| |\ \ \ | | |/ / | |/| |
* | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-160-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: Ifb9d8e9321f4089f98600b8813016735a2b3131f
| * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-150-0/+0
| |\ \ \
| | * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-140-0/+0
| | |\ \ \ | | |/ / / | |/| / / | | |/ /
* | | | am 0f452131: Update kernel prebuiltArve Hjønnevåg2011-12-141-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '0f4521310f9aaef7bb61264be8a3574c59347941': Update kernel prebuilt
| * | | Update kernel prebuiltArve Hjønnevåg2011-12-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e0f3bc Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 f59af41 Merge branch 'linux-omap-3.0' into android-omap-3.0 7ee11a3 OMAP4: PM: omap4_trigger_ioctrl: use proper mask for proper delay 5a44bf3 ARM: omap4: gpio: Use pad wakeupevent to detect pulses for edge triggered gpios aa7b27c ARM: omap4: gpio: Fix omap2_gpio_set_wakeupenables to have an effect 0f571a6 Revert "Revert "ARM: omap4: gpio: Fix lost gpio edge interrutps in low power idle modes."" Change-Id: Iab7c12209dfaede9b54c3ca33362e9afb6e7c672
* | | | am baa510e8: tuna: update kernel prebuiltColin Cross2011-12-141-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'baa510e85ad67acf27e2e266079809855f6bbddc': tuna: update kernel prebuilt
| * | | tuna: update kernel prebuiltColin Cross2011-12-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ea95b9 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 c572dd6 Merge branch 'linux-omap-3.0' into android-omap-3.0 1933680 Revert "HACK: ARM: tuna: disable L3_SLEEP when MHL is active" a2b7ca0 omap: dispc: force L3_1 CD to NOSLEEP when dispc module is active. f75e54b Merge branch 'linux-omap-3.0' into android-omap-3.0 Change-Id: Ie211023b9ce92455765867785e4184ddc61a98db
* | | | am 3f14aceb: new kernel prebuiltErik Gilling2011-12-141-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3f14acebdca39f25ffa2378cd3d8c024d1ceb2c8': new kernel prebuilt
| * | | new kernel prebuiltErik Gilling2011-12-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: 720b316 HACK: video: ti_hdmi: print warning on invalid AKSV f5b62aa Revert "HACK: OMAP4: HDCP: enable HDCP debug messages" Change-Id: Ibae1ec806cd28db4fb4a03db2003f14eb7bc12d1 Signed-off-by: Erik Gilling <konkers@android.com>
* | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I41613fd28aed3a2725ae944a1e6d0a8f0ee6e446
| * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-130-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-130-0/+0
| | |\ \
* | | \ \ am 45dfd465: new kernel prebuiltBenoit Goby2011-12-131-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '45dfd46501b2475c262d4f2c08453a0f2bd53d8f': new kernel prebuilt
| * | | | new kernel prebuiltBenoit Goby2011-12-131-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 49a0ff3 modem_if: io: initialize skb->mac_header before passing it to netif_rx(). Change-Id: Ie3212e51b9cb8f0b19cb2d7c095fa15b2a7a0d2a
* | | | | am 253073f8: new kernel prebuiltErik Gilling2011-12-131-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '253073f887a6eb251f8cd8647f3eca116ee06924': new kernel prebuilt
| * | | | new kernel prebuiltErik Gilling2011-12-131-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: aa15d2e ARM: tuna: support Samsung's MHL adopter ID bdc7da3 HACK: ARM: tuna: disable L3_SLEEP when MHL is active 68852cb Merge branch 'linux-omap-3.0' into android-omap-tuna-3.0 93bf526 ARM: tuna: correctly report VBUS/CHARGER on MHL 3b6efd3 OMAPLFB/DSSCOMP: Added support for non-gralloc layers in Post2 Change-Id: I2cdf1feadbf9be42e92dbda0421bd3a4b25b2ae5 Signed-off-by: Erik Gilling <konkers@android.com>
* | | | | am bba3d2f3: Add portrait dock imageErik Gilling2011-12-132-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'bba3d2f3e939c0c6fb044d4500a127ea45c925a7': Add portrait dock image
| * | | | Add portrait dock imageErik Gilling2011-12-132-0/+4
| |/ / / | | | | | | | | | | | | | | | | Change-Id: Iebb24768b81bb214f093e6148e967820568ec470 Signed-off-by: Erik Gilling <konkers@android.com>
* | | | am 93953386: Merge "Run tf_daemon as class main instead of class core" into ↵Jeff Tinker2011-12-131-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit '939533862a8218f6fabfd79fd3226d8e6b4e6e0c': Run tf_daemon as class main instead of class core
| * | | Merge "Run tf_daemon as class main instead of class core" into ics-mr1Jeff Tinker2011-12-131-1/+1
| |\ \ \
| | * | | Run tf_daemon as class main instead of class coreJeff Tinker2011-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie416980d1cc347a1e939776649bffcfbdd8960ff related-to-bug: 5751212
* | | | | am 70615311: Merge "new kernel prebuilt" into ics-mr1Simon Wilson2011-12-131-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '70615311a39714307212f850f1ae8abb667b1dea': new kernel prebuilt
| * | | | Merge "new kernel prebuilt" into ics-mr1Simon Wilson2011-12-131-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | new kernel prebuiltSimon Wilson2011-12-131-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e26e77 Revert "ARM: omap4: gpio: Fix lost gpio edge interrutps in low power idle modes." Change-Id: I9b50b80beafcd1ab032e30aa067ef93199d7464c
* | | | | am 7a170e19: audio HAL: release audio pre processing buffers.Eric Laurent2011-12-131-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '7a170e19114fefef3f644252d5eabbb5fc6afb9e': audio HAL: release audio pre processing buffers.
| * | | | audio HAL: release audio pre processing buffers.Eric Laurent2011-12-131-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Buffers allocated for audio pre processing are not released when an input stream is closed. Issue 5753047. Change-Id: Ie8fd5f49d97e9bebc70fc38de0844a79074ac526
* | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-120-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I583d42acf0b10b2f276bf0b3dac109f2781e36f9
| * | | tuna: prebuilt kernelTodd Poynor2011-12-101-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 239904e OMAP4: tuna: Mask all twl6030 charge control IRQs except VBUS_DET Change-Id: I9c86c70473013bf547f414e04a20acd4a32191c2 Signed-off-by: Todd Poynor <toddpoynor@google.com>
generated by cgit v1.1 at 2024-07-02 10:59:33 +0000