| commit | 73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 25 12:03:58 2011 +0200 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 25 12:03:58 2011 +0200 |
| tree | 7a7b6cb22d1edaec10c3ae9d961b6e04c37d380c | |
| parent | 31dced41c6822ce751c033a53502ea4d8d399422 [diff] | |
| parent | 1d927c3b5a4005a2ebc5356e7e1eec436e15fa22 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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()