| commit | ad469ffb08295f93a1907cef78277a74e6075119 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Fri Oct 14 14:39:38 2011 -0700 |
| committer | QuIC Gerrit Code Review <code-review@localhost> | Fri Oct 14 14:39:38 2011 -0700 |
| tree | 70d85d52089ec6125d6538104aacde8faeb58c90 | |
| parent | 8fd8efdf0e90aca41a2e2f0eab9a53a1c3982989 [diff] | |
| parent | 120aac4c1ea78411bce03826ffec05f52eaaf5a9 [diff] |
Merge "msm: watchdog: increase pet time to ten seconds" into msm-3.0