GoogleGit

commit6c3978c3f224e6b40ff9c981aae3c29a08e4ff4f[log][tgz]
authorArve Hjønnevåg <arve@android.com>Wed Mar 21 16:43:45 2012 -0700
committerArve Hjønnevåg <arve@android.com>Wed Mar 21 17:31:29 2012 -0700
treedd39fdd8fcbd1d55b248e760280094ed352614e3
parent59c75bcf603f355ff34282422e8c3f2165b9d5f2[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>
1 file changed
tree: dd39fdd8fcbd1d55b248e760280094ed352614e3
  1. .gitignore
  2. .mailmap
  3. COPYING
  4. CREDITS
  5. Documentation/
  6. Kbuild
  7. Kconfig
  8. MAINTAINERS
  9. Makefile
  10. README
  11. REPORTING-BUGS
  12. arch/
  13. block/
  14. crypto/
  15. drivers/
  16. firmware/
  17. fs/
  18. include/
  19. init/
  20. ipc/
  21. kernel/
  22. lib/
  23. mm/
  24. net/
  25. samples/
  26. scripts/
  27. security/
  28. sound/
  29. tools/
  30. usr/
  31. virt/