]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'pm-qos' into pm-test
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 26 Sep 2011 18:38:01 +0000 (20:38 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Mon, 26 Sep 2011 18:38:01 +0000 (20:38 +0200)
commit3542ea633f2af7f257088536b0d0efab0e35f8bd
treebf89d57df9a4b44e9d5c9155c887c1e03ae737c3
parent1a588016928ea232bbe21b6fe6c5676b1a38040b
parentd41a041b58684710638cbc0d5342a661b50db124
Merge branch 'pm-qos' into pm-test

* pm-qos:
  PM / QoS: Add function dev_pm_qos_read_value() (v2)
  PM QoS: Add global notification mechanism for device constraints
  PM QoS: Implement per-device PM QoS constraints
  PM QoS: Generalize and export constraints management code
  PM QoS: Reorganize data structs
  PM QoS: Code reorganization
  PM QoS: Minor clean-ups
  PM QoS: Move and rename the implementation files
drivers/media/video/via-camera.c
drivers/net/wireless/ipw2x00/ipw2100.c
include/linux/pm.h
net/mac80211/main.c