diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 15:08:05 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 15:08:18 +0200 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /CREDITS | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
| download | linux-e060c38434b2caa78efe7cedaff4191040b65a15.tar.bz2 | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 17 |
1 files changed, 16 insertions, 1 deletions
@@ -504,7 +504,7 @@ N: Dominik Brodowski E: linux@brodo.de W: http://www.brodo.de/ P: 1024D/725B37C6 190F 3E77 9C89 3B6D BECD 46EE 67C3 0308 725B 37C6 -D: parts of CPUFreq code, ACPI bugfixes +D: parts of CPUFreq code, ACPI bugfixes, PCMCIA rewrite, cpufrequtils S: Tuebingen, Germany N: Andries Brouwer @@ -857,6 +857,10 @@ S: One Dell Way S: Round Rock, TX 78682 S: USA +N: Mattia Dongili +E: malattia@gmail.com +D: cpufrequtils (precursor to cpupowerutils) + N: Ben Dooks E: ben-linux@fluff.org E: ben@simtec.co.uk @@ -1883,6 +1887,11 @@ S: Kruislaan 419 S: 1098 VA Amsterdam S: The Netherlands +N: Goran Koruga +E: korugag@siol.net +D: cpufrequtils (precursor to cpupowerutils) +S: Slovenia + N: Jiri Kosina E: jikos@jikos.cz E: jkosina@suse.cz @@ -2916,6 +2925,12 @@ S: Schlossbergring 9 S: 79098 Freiburg S: Germany +N: Thomas Renninger +E: trenn@suse.de +D: cpupowerutils +S: SUSE Linux GmbH +S: Germany + N: Joerg Reuter E: jreuter@yaina.de W: http://yaina.de/jreuter/ |