summaryrefslogtreecommitdiff
path: root/net/wireless
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-11-21 15:31:42 (GMT)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-11-21 15:31:42 (GMT)
commit0a924200ae5fcf7b3d237d92a110545b6db6aa18 (patch)
tree2b6543b97264c11f0e948b568ec397c50d54eb76 /net/wireless
parenta74a5a3381c0f600d390e3997976c4ddf31417ab (diff)
parentb82b6cca488074da3852e8a54fde1d9f74bf1557 (diff)
downloadlinux-0a924200ae5fcf7b3d237d92a110545b6db6aa18.tar.xz
Merge back earlier cpuidle material for 3.19-rc1.
Conflicts: drivers/cpuidle/dt_idle_states.c
Diffstat (limited to 'net/wireless')
0 files changed, 0 insertions, 0 deletions