]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 986d1e3 5e38d33)
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)
commit8f19be32652e490c2c70e6d2d7bfe59e9190607f
treec9895e2b9a2b8ab30b1fbd8b0764a60fdcf3f4fftree | snapshot
parent986d1e36796d83114968636b6bf12c70acb9dedfcommit | diff
parent5e38d33dc740bc528531e2e3a1af8714d3f0cfdbcommit | 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.