summaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq/powernow-k8.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2015-03-30 16:37:08 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-03-30 16:37:08 +0200
commit6e0aa8018f9c676b115b7ca6c20a056fc57c68a9 (patch)
treeb35393574b48dcc05c99599add7f8b0015de3913 /drivers/cpufreq/powernow-k8.c
parent1ff27a3443addb19af609245b218fa510c7d37dd (diff)
parente42391cd048809d903291d07f86ed3934ce138e9 (diff)
downloadtalos-op-linux-6e0aa8018f9c676b115b7ca6c20a056fc57c68a9.tar.gz
talos-op-linux-6e0aa8018f9c676b115b7ca6c20a056fc57c68a9.zip
Merge tag 'v4.0-rc6' into drm-intel-next
Backmerge Linux 4.0-rc6 because conflicts are (again) getting out of hand. To make sure we don't lose any bugfixes from the 4.0-rc5-rc6 flurry of patches we've applied them all to -next too. Conflicts: drivers/gpu/drm/i915/intel_display.c Always take the version from -next, we've already handled all conflicts with explicit cherrypicking. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/cpufreq/powernow-k8.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud