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.