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

Pull APM cleanup from Jiri Kosina.
This commit is contained in:
Rafael J. Wysocki 2014-07-09 14:46:07 +02:00
commit 42062234cb

View File

@ -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()) {