]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2f525ec 069b644)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Apr 2012 00:34:30 +0000 (17:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Apr 2012 00:34:30 +0000 (17:34 -0700)
commitbf052960f8b8b143422dc03a3b6b8d8fcd78069b
treec9895e2b9a2b8ab30b1fbd8b0764a60fdcf3f4fftree | snapshot
parent2f525ec6400aeaf61afd3e92cef24774388a6abdcommit | diff
parent069b644f7f02984d70447f97332c77ecbae4f597commit | 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
drivers/char/apm-emulation.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.