Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm

Browse source

* '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()

...

This commit is contained in:

Linus Torvalds 2011-10-25 12:03:58 +02:00

parent 31dced41c6 1d927c3b5a

commit 73692d9bb5

1 changed files with 6 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

16

drivers/char/apm-emulation.c

View file