diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 12:03:58 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 12:03:58 +0200 |
| commit | 73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26 (patch) | |
| tree | 7a7b6cb22d1edaec10c3ae9d961b6e04c37d380c /kernel | |
| parent | 31dced41c6822ce751c033a53502ea4d8d399422 (diff) | |
| parent | 1d927c3b5a4005a2ebc5356e7e1eec436e15fa22 (diff) | |
| download | linux-73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26.tar.bz2 | |
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()
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions