summaryrefslogtreecommitdiff
path: root/drivers/iio/pressure/mpl115_i2c.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-01-31 10:28:23 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-01-31 10:28:23 +0100
commit82b2c6ffd399c9fcd542fd681bb8c6d41f035c7e (patch)
tree68371423735623f35991e40ee89aa8751fd21936 /drivers/iio/pressure/mpl115_i2c.c
parent709bd70d070ee6d775c6e77e40e8444bd5fa123f (diff)
parent1e4f63aecb53e48468661e922fc2fa3b83e55722 (diff)
parent0552e05fdfea191a2cf3a0abd33574b5ef9ca818 (diff)
Merge branches 'pm-cpufreq' and 'pm-core'
* pm-cpufreq: cpufreq: Avoid creating excessively large stack frames * pm-core: PM: core: Fix handling of devices deleted during system-wide resume