From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 5 Aug 2014 20:49:45 +0000 (+0200)
Subject: Merge branch 'pm-sleep'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ddbe8db147cd0954da93dc6986f4793bcabb3889;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'pm-sleep'

* pm-sleep:
  PM / Hibernate: Touch Soft Lockup Watchdog in rtree_next_node
  PM / Hibernate: Remove the old memory-bitmap implementation
  PM / Hibernate: Iterate over set bits instead of PFNs in swsusp_free()
  PM / Hibernate: Implement position keeping in radix tree
  PM / Hibernate: Add memory_rtree_find_bit function
  PM / Hibernate: Create a Radix-Tree to store memory bitmap
  PM / sleep: fix kernel-doc warnings in drivers/base/power/main.c
---

ddbe8db147cd0954da93dc6986f4793bcabb3889