From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Oct 2011 10:03:58 +0000 (+0200)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
X-Git-Tag: v3.2~479
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26;p=platform%2Fkernel%2Flinux-amlogic.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
  apm-emulation: use wait_event_freezable() instead of freezer_[do_not_]count()
---

73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26