]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
projects / users / willy / pagecache.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31dced4 1d927c3)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Oct 2011 10:03:58 +0000 (12:03 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Oct 2011 10:03:58 +0000 (12:03 +0200)
* '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()

1  2 
drivers/char/apm-emulation.c patch | diff1 | diff2 | blob | history

diff --cc drivers/char/apm-emulation.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.