Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Oct 2011 10:03:58 +0000 (12:03 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Oct 2011 10:03:58 +0000 (12:03 +0200)
commit73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26
tree7a7b6cb22d1edaec10c3ae9d961b6e04c37d380c
parent31dced41c6822ce751c033a53502ea4d8d399422
parent1d927c3b5a4005a2ebc5356e7e1eec436e15fa22
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()
drivers/char/apm-emulation.c