| commit | 6c3978c3f224e6b40ff9c981aae3c29a08e4ff4f | [log] [tgz] |
|---|---|---|
| author | Arve Hjønnevåg <arve@android.com> | Wed Mar 21 16:43:45 2012 -0700 |
| committer | Arve Hjønnevåg <arve@android.com> | Wed Mar 21 17:31:29 2012 -0700 |
| tree | dd39fdd8fcbd1d55b248e760280094ed352614e3 | |
| parent | 59c75bcf603f355ff34282422e8c3f2165b9d5f2 [diff] |
Fix 3.3 merge error in: drivers: power: Add watchdog timer to catch drivers which lockup during suspend. __device_suspend could return with an active timer on the stack Change-Id: I113f5f9aa12f909cb46621b6744e02a104ddd2bd Signed-off-by: Arve Hjønnevåg <arve@android.com>