Skip to content

Commit

Permalink
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/…
Browse files Browse the repository at this point in the history
…git/jikos/apm into pm-apm

Pull APM cleanup from Jiri Kosina.
  • Loading branch information
Rafael J. Wysocki committed Jul 9, 2014
2 parents cd3de83 + 53675ab commit 4206223
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion arch/x86/kernel/apm_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,6 @@ static int apm_do_idle(void)
u32 eax;
u8 ret = 0;
int idled = 0;
int polling;
int err = 0;

if (!need_resched()) {
Expand Down

0 comments on commit 4206223

Please sign in to comment.