]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d64c3b0 e7ddf4b)
Merge branch 'sfi' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux into...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 9 Feb 2015 22:43:53 +0000 (23:43 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 9 Feb 2015 22:43:53 +0000 (23:43 +0100)
Pull SFI-based cpufreq driver for v3.20 from Len Brown.

* 'sfi' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  cpufreq: Add SFI based cpufreq driver support
  SFI: fix compiler warnings

1  2 
arch/x86/include/uapi/asm/msr-index.h patch | diff1 | diff2 | blob | history
drivers/cpufreq/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/x86/include/uapi/asm/msr-index.h
Simple merge
diff --cc drivers/cpufreq/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.