summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-24 01:51:50 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-24 01:51:50 +0100
commit4416b0eaa3d51f3e360d6e171e603ff51848bcf5 (patch)
tree1fa54240a606bc34a35e2eb99f06e91ec269fc01 /drivers/platform
parentMerge branch 'pcmcia' of git://git.linaro.org/people/rmk/linux-arm (diff)
parentMerge branch 'for_3.4/cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
downloadlinux-4416b0eaa3d51f3e360d6e171e603ff51848bcf5.tar.xz
linux-4416b0eaa3d51f3e360d6e171e603ff51848bcf5.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
Pull cpufreq fixes from Dave Jones: "I meant to get some of these in for 3.3 final, but left things too late, so I've got two trees this time." * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: cpufreq: OMAP: specify range for voltage scaling cpufreq: OMAP: scale voltage along with frequency cpufreq: OMAP driver depends CPUfreq tables
Diffstat (limited to 'drivers/platform')
0 files changed, 0 insertions, 0 deletions