From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Apr 2012 00:34:30 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
X-Git-Tag: MMI-PSA29.97-13-9~17052
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fb9d78aca709b7a6389c79d6211fb384c69bb79f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/apm

Pull an APM fix from Jiri Kosina:
 "One deadlock/race fix from Niel that got introduced when we were
  moving away from freezer_*_count() to wait_event_freezable()."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
  APM: fix deadlock in APM_IOC_SUSPEND ioctl
---

fb9d78aca709b7a6389c79d6211fb384c69bb79f