| commit | fb9d78aca709b7a6389c79d6211fb384c69bb79f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 05 17:34:30 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 05 17:34:30 2012 -0700 |
| tree | c9895e2b9a2b8ab30b1fbd8b0764a60fdcf3f4ff | |
| parent | 5d32c88f0b94061b3af2e3ade92422407282eb12 [diff] | |
| parent | f283d22713b0bdc147097c92c9b45855339cf1c8 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm Pull an APM fix from Jiri Kosina: "One deadlock/race fix from Niel that got introduced when we were moving away from freezer_*_count() to wait_event_freezable()." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm: APM: fix deadlock in APM_IOC_SUSPEND ioctl