projects / linux-drm-fsl-dcu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5d32c88 f283d22)
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)
commitfb9d78aca709b7a6389c79d6211fb384c69bb79f
treec9895e2b9a2b8ab30b1fbd8b0764a60fdcf3f4fftree | snapshot
parent5d32c88f0b94061b3af2e3ade92422407282eb12commit | diff
parentf283d22713b0bdc147097c92c9b45855339cf1c8commit | diff
Merge branch 'for-linus' of git://git./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
Freescale DCU DRM driver