Gitweb: http://git.kernel.org/linus/70aff0ce210f58afa3ed47102532f20834da31b3 Commit: 70aff0ce210f58afa3ed47102532f20834da31b3 Parent: 589643be6693c46fbc54bae77745f336c8ed4bcc Author: Joe Perches <joe@perches.com> AuthorDate: Mon Jul 12 17:45:49 2010 -0300 Committer: Linus Torvalds <torvalds@linux-foundation.org> CommitDate: Mon Jul 12 14:42:05 2010 -0700 MAINTAINERS: fix EDAC-I7CORE file patterns File patterns are one per line. Fixed include file location. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> --- MAINTAINERS | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a07a49d..5884812 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2121,7 +2121,9 @@ M: Mauro Carvalho Chehab <mchehab@redhat.com> L: linux-edac@vger.kernel.org W: bluesmoke.sourceforge.net S: Maintained -F: drivers/edac/i7core_edac.c linux/edac_mce.h drivers/edac/edac_mce.c +F: drivers/edac/i7core_edac.c +F: drivers/edac/edac_mce.c +F: include/linux/edac_mce.h EDAC-I82975X M: Ranganathan Desikan <ravi@jetztechnologies.com> --
Gitweb: http://git.kernel.org/linus/fdd45ef44cfe84037f44ab386915b55c32a58bf7 Commit: fdd45ef44cfe84037f44ab386915b55c32a58bf7 Parent: 67a3e12b05e055c0415c556a315a3d3eb637e29e Author: Randy Dunlap <randy.dunlap@oracle.com> AuthorDate: Thu May 27 09:07:06 2010 -0700 Committer: Jiri Kosina <jkosina@suse.cz> CommitDate: Mon May 31 13:57:45 2010 +0200 HID: roccat: fix modules interdependencies hid-roccat-kone calls the hid-roccat module interfaces, so the former should depend on or select the latter to prevent build errors, like: hid-roccat-kone.c:(.text+0x133ed2): undefined reference to `roccat_report_event' hid-roccat-kone.c:(.text+0x133fa8): undefined reference to `roccat_disconnect' hid-roccat-kone.c:(.text+0x1353be): undefined reference to `roccat_connect' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> --- drivers/hid/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 132278f..4340993 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -358,6 +358,7 @@ config HID_ROCCAT config HID_ROCCAT_KONE tristate "Roccat Kone Mouse support" depends on USB_HID + select HID_ROCCAT ---help--- Support for Roccat Kone mouse. --
Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a8d7c3... Commit: a8d7c3bc2396aff14f9e920677072cb55b016040 Parent: c5829cd07ec4c08daa7ff91c821af9b2ac7748df Author: Elias Oltmanns <eo@nebensachen.de> AuthorDate: Mon Oct 22 09:50:13 2007 +0200 Committer: Dave Jones <davej@redhat.com> CommitDate: Mon Oct 22 16:34:39 2007 -0400 [CPUFREQ] Make cpufreq_conservative handle out-of-sync events properly Make cpufreq_conservative handle out-of-sync events properly Currently, the cpufreq_conservative governor doesn't get notified when the actual frequency the cpu is running at differs from what cpufreq thought it was. As a result the cpu may stay at the maximum frequency after a s2ram / resume cycle even though the system is idle. Signed-off-by: Elias Oltmanns <eo@nebensachen.de> Signed-off-by: Dave Jones <davej@redhat.com> --- drivers/cpufreq/cpufreq_conservative.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index 4bd33ce..57d02e9 100644 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c @@ -116,6 +116,27 @@ static inline unsigned int get_cpu_idle_time(unsigned int cpu) return ret; } +/* keep track of frequency transitions */ +static int +dbs_cpufreq_notifier(struct notifier_block *nb, unsigned long val, + void *data) +{ + struct cpufreq_freqs *freq = data; + struct cpu_dbs_info_s *this_dbs_info = &per_cpu(cpu_dbs_info, + freq->cpu); + + if (!this_dbs_info->enable) + return 0; + + this_dbs_info->requested_freq = freq->new; + + return 0; +} + +static struct notifier_block dbs_cpufreq_notifier_block = { + .notifier_call = dbs_cpufreq_notifier +}; + /************************** sysfs interface ************************/ static ssize_t ...
