Fix 3.3 merge error in: drivers: power: Add watchdog timer to catch drivers which...
authorArve Hjønnevåg <arve@android.com>
Wed, 21 Mar 2012 23:43:45 +0000 (16:43 -0700)
committerVarun Wadekar <vwadekar@nvidia.com>
Wed, 11 Apr 2012 09:58:27 +0000 (14:58 +0530)
commit0764cdfbebe803c5c5e9c664f9ae7696fa12d106
tree5e81f813af75d58ec887f378850b374a254cd916
parentbcc997dd990765b06044ca16e62c01fea146c7ad
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>
drivers/base/power/main.c