pm-6.4-rc1-2

 - Make test_resume work again after the changes that made hibernation
   open the snapshot device in exclusive mode (Chen Yu).

 - Clean up code in several places in intel_idle (Artem Bityutskiy).