From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Wed, 18 Jul 2012 22:03:50 +0000 (+0200)
Subject: Merge branch 'pm-qos'
X-Git-Tag: firefly_0821_release~3680^2~2411^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bd798b7a88069b6ad273214ca3901d988104db71;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pm-qos'

* pm-qos:
  PM / QoS: Use NULL pointer instead of plain integer in qos.c
  PM / QoS: Use NULL pointer instead of plain integer in pm_qos.h
---

bd798b7a88069b6ad273214ca3901d988104db71