tree 16718edcebee40195a12dc01c7037b17c8f619f0
parent 9bad5845485ec22b31d4489c3bd6d96d78442437
parent 6a0c7cd33075f6b7f1d80145bb19812beb3fc5c9
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1384819628 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1384819628 +0100

Merge branch 'pm-sleep'

* pm-sleep:
  PM / Hibernate: Do not crash kernel in free_basic_memory_bitmaps()