summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | am bed53516: tuna: update kernel prebuilt -- DO NOT MERGEBenoit Goby2012-02-171-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'bed53516982d3c5688d68aae29ea53680ad8fe81': tuna: update kernel prebuilt -- DO NOT MERGE
| | * | | | tuna: update kernel prebuilt -- DO NOT MERGEBenoit Goby2012-02-171-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b3a99d OMAP4+: HSI: fix for spurious CAWAKE event while processing RX/TX b18735e OMAP4: HSI: Add HW errata platform data 30624ea OMAP4: HSI: Fix for back to back CAWAKE interrupts Change-Id: I400f3217f3c941e543b79663347e0a2039b3f4c6
| * | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-170-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Change-Id: Iba93a06323902184286c2d0c370a838f313fb445
| | * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-02-160-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| * | | | | am 26c2ea0a: tuna: prebuilt kernel -- DO NOT MERGETodd Poynor2012-02-161-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '26c2ea0a893cf9e2e662ff0ea1aca972cb16f085': tuna: prebuilt kernel -- DO NOT MERGE
| | * | | | tuna: prebuilt kernel -- DO NOT MERGETodd Poynor2012-02-151-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35315c0 DEBUG: rtc: twl: add register dump if RTC did not fire on time Change-Id: I677478e4c82886f680bd154108b63d8abbe30663 Signed-off-by: Todd Poynor <toddpoynor@google.com>
| * | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Change-Id: Ic91d3c882c877bac3fa3c26ab62d6c68e2ade8d4
| | * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-310-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-300-0/+0
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-300-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | Change-Id: I38448f137d45fed527dbcfbae8da9eb4a5fee25b
| | * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-300-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | |
| | | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-260-0/+0
| | | |\ \ \
| | | | * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-250-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-240-0/+0
| | | | | |\ \ \
| * | | | | \ \ \ am c55fbc67: Update kernel prebuilt -- DO NOT MERGEArve Hjønnevåg2012-01-301-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c55fbc67a5c8f02a4663f57844f5bd5bfd3b61bd': Update kernel prebuilt -- DO NOT MERGE
| | * | | | | | | Update kernel prebuilt -- DO NOT MERGEArve Hjønnevåg2012-01-271-0/+0
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21f62a0 ARM: omap4: tuna: Add panel configration for SM2A2 Line support. Change-Id: I7af3b742506e14c17218c42e04a0082673814f67
| * | | | | | | am 400a1718: tuna: prebuilt kernel -- DO NOT MERGEDmitry Shmidt2012-01-261-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '400a17182e7c28ef2ff7697889689bdbcb87af33': tuna: prebuilt kernel -- DO NOT MERGE
| | * | | | | | tuna: prebuilt kernel -- DO NOT MERGEDmitry Shmidt2012-01-261-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec29a34 mmc: omap_hsmmc: Prevent calling mmc_host_lazy_disable() on suspend path Change-Id: I85bb2002f52012d8f11ab4da9c63a8aab158c146 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| * | | | | | | am c2ff429f: Merge "audio: support multiple output PCMs" into ics-mr1Simon Wilson2012-01-261-48/+117
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c2ff429f7bea57e0d774544ec9aeac4c25497317': audio: support multiple output PCMs
| | * | | | | | Merge "audio: support multiple output PCMs" into ics-mr1Simon Wilson2012-01-261-48/+117
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | audio: support multiple output PCMsSimon Wilson2012-01-251-48/+117
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I5179699b22224473bd158e90f864e4e73895b5dc
| * | | | | | am 26f9aacc: require bootloader LA03Ed Heyl2012-01-251-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '26f9aacc85305b20559e348109a3be3350704985': require bootloader LA03
| | * | | | | require bootloader LA03Ed Heyl2012-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I781dc9265a6e520d053abf663acfa9dc128f932e Conflicts: board-info.txt
| * | | | | | am d48e3623: tuna: prebuilt kernel -- DO NOT MERGETodd Poynor2012-01-251-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'd48e3623c7b43da6be5c4980cee192264e8cb979': tuna: prebuilt kernel -- DO NOT MERGE
| | * | | | | tuna: prebuilt kernel -- DO NOT MERGETodd Poynor2012-01-241-0/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2a12a5 Revert "Revert "mmc: Set suspend/resume bus operations if CONFIG_PM_RUNTIME is used"" a752602 serial: omap: disable serial port irq during suspend Change-Id: I9445220aee7f20ba2c5a773c45d413a73747c79c Signed-off-by: Todd Poynor <toddpoynor@google.com>
| * | | | | am 5348e6bc: tuna: prebuilt kernel -- DO NOT MERGESimon Wilson2012-01-241-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '5348e6bc0a6e338f8747547bcd79adcc6aaa481d': tuna: prebuilt kernel -- DO NOT MERGE
| | * | | | tuna: prebuilt kernel -- DO NOT MERGESimon Wilson2012-01-241-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e99370d ASoC: Tuna: Reduce S/PDIF power down time b2e44ef TWL6030: Add extra debugging around rtc and waking 159f916 Revert "usb: musb: Add a BUG_ON if trying to suspend musb in B_IDLE state" 34b0c02 usb: musb: Disable SESSREQ and VBUSERROR interrupts 3e367ee ARM: omap: sched_clock: Don't let sched_clock tick during suspend Change-Id: I5081b4c29e5f139a00f205540213a72e7c6afd2c
| * | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-230-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Change-Id: I5fd9e8ce865b0bf8341704ec0d061dfaceb42d05
| | * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-200-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| * | | | | am 159a810d: tuna: prebuilt kernel -- DO NOT MERGEDima Zavin2012-01-201-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '159a810daa779bfb93b50cd1d899c54a6453248d': tuna: prebuilt kernel -- DO NOT MERGE
| | * | | | tuna: prebuilt kernel -- DO NOT MERGEDima Zavin2012-01-191-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6224f02 Revert "proc: enable writing to /proc/pid/mem" Change-Id: Ia7000d5ca40ed4417e44d3470e0929763ce775a7 Signed-off-by: Dima Zavin <dima@android.com>
| * | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-190-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Change-Id: I3a5742cd5b1453c3f2994e21083fb62747037faa
| | * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-180-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-130-0/+0
| | | |\ \ \
| * | | \ \ \ am bac9a478: tuna: prebuilt kernel -- DO NOT MERGETodd Poynor2012-01-181-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'bac9a4787055cce78df950755f48740597a0c574': tuna: prebuilt kernel -- DO NOT MERGE
| | * | | | | tuna: prebuilt kernel -- DO NOT MERGETodd Poynor2012-01-181-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c553b5b OMAP4: Clock: Force a DPLL clkdm/pwrdm ON before a relock Change-Id: I9631025af9090d374e641b7a4aebf36daac4e6a9 Signed-off-by: Todd Poynor <toddpoynor@google.com>
| * | | | | | am 9deb91b3: Merge "tuna: prebuilt kernel -- DO NOT MERGE" into ics-mr1Todd Poynor2012-01-181-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '9deb91b362aeb9fc5321e9f66bca0d0096a74568': tuna: prebuilt kernel -- DO NOT MERGE
| | * | | | | Merge "tuna: prebuilt kernel -- DO NOT MERGE" into ics-mr1Todd Poynor2012-01-181-0/+0
| | |\ \ \ \ \
| | | * | | | | tuna: prebuilt kernel -- DO NOT MERGETodd Poynor2012-01-181-0/+0
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ace783 Revert "mmc: Set suspend/resume bus operations if CONFIG_PM_RUNTIME is used" 8716f56 omap4: tuna: Drop soft lockup detector timeout to 10 secs 159f17c OMAP3+: PM: VC: vcbypass needs to wait for valid to clear 655fddd OMAP4: PM: TPS6236x: speed up voltage rampup rate 37d2aca OMAP4: PM: TPS6236x: ensure rampdown occurs fast on shutdown 058ca02 OMAP4460: TWL6030: Setup VDD_core OFF voltage to retention voltage 3d57d92 OMAP4: PM: work around for CPU1 onlining from OFF/OSWR state on older PPA 0108824 OMAP4: TWL: ensure PREQ1 results in all active VCOREs to be down 7180250 OMAP4: HWMOD: UART1: disable smart-idle. fdb7588 misc: fsa9480: don't enable FSA IRQ when VBUS IRQ is enabled ce033dd ASoC: DSP: Split runtime startup/shutdown updates a567f64 ASoC: dsp - BE disconnection after pending flag is clear 60f7431 misc: modem_if: link_mipi: Reset mipi phy when receive wrong packet fc3549e usb: musb: Change BUG_ON to BUG to catch the issue as soon as it happens Change-Id: Ic27e8bf5f08b6ac308a9aa26711da16d5e0cb6d6 Signed-off-by: Todd Poynor <toddpoynor@google.com>
| * | | | | | 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