From: Linus Torvalds 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.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