]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'pm-qos' into pm-test
authorRafael J. Wysocki <rjw@sisk.pl>
Thu, 29 Sep 2011 20:08:00 +0000 (22:08 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Thu, 29 Sep 2011 20:08:00 +0000 (22:08 +0200)
commit1992931b100131067db880634d2a2d63ebf23d29
tree3b3fa79b0eda4b8e0dc236480c7a84738f9c5e9d
parentb9cca7f48c9bfbf78e1cb03a935d4d4f6779252c
parentb66213cdb002b08b29603d488c451dfe25e2ca20
Merge branch 'pm-qos' into pm-test

* pm-qos:
  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