aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-22 14:34:09 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-22 14:34:09 -0400
commitf20e3b5fe7ead0615309433260b9784d8da0bbbd (patch)
treeeabb2e47a0355ac4e8024b7087b4e7cb9f324358 /CREDITS
parentbcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff)
parentf030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff)
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS12
1 files changed, 6 insertions, 6 deletions
diff --git a/CREDITS b/CREDITS
index c62dcb3b7e26..2358846f06be 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1653,14 +1653,14 @@ S: Chapel Hill, North Carolina 27514-4818
1653S: USA 1653S: USA
1654 1654
1655N: Dave Jones 1655N: Dave Jones
1656E: davej@codemonkey.org.uk 1656E: davej@redhat.com
1657W: http://www.codemonkey.org.uk 1657W: http://www.codemonkey.org.uk
1658D: x86 errata/setup maintenance. 1658D: Assorted VIA x86 support.
1659D: AGPGART driver. 1659D: 2.5 AGPGART overhaul.
1660D: CPUFREQ maintenance. 1660D: CPUFREQ maintenance.
1661D: Backport/Forwardport merge monkey. 1661D: Fedora kernel maintainence.
1662D: Various Janitor work. 1662D: Misc/Other.
1663S: United Kingdom 1663S: 314 Littleton Rd, Westford, MA 01886, USA
1664 1664
1665N: Martin Josfsson 1665N: Martin Josfsson
1666E: gandalf@wlug.westbo.se 1666E: gandalf@wlug.westbo.se