tree 8810da22b0ac8f4278c5ac63071f2f5388447238
parent f0315f8b2193165381583437bde0eff762407b80
parent 9d10f839b1bceef2a1e158a6341184b521663d72
author Linux Build Service Account <lnxbuild@localhost> 1374810536 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> 1374810535 -0700

Merge "msm: bam_dmux: Update UL wakeup timeout to two seconds"