aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-04-26 04:22:15 -0400
committerJiri Kosina <jkosina@suse.cz>2011-04-26 04:22:59 -0400
commit07f9479a40cc778bc1462ada11f95b01360ae4ff (patch)
tree0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /CREDITS
parent9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff)
parentcd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff)
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be applied for files that didn't exist on the old branch.
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS6
1 files changed, 3 insertions, 3 deletions
diff --git a/CREDITS b/CREDITS
index 10c180311e88..95c469c610bc 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1677,7 +1677,7 @@ W: http://www.codemonkey.org.uk
1677D: Assorted VIA x86 support. 1677D: Assorted VIA x86 support.
1678D: 2.5 AGPGART overhaul. 1678D: 2.5 AGPGART overhaul.
1679D: CPUFREQ maintenance. 1679D: CPUFREQ maintenance.
1680D: Fedora kernel maintainence. 1680D: Fedora kernel maintenance.
1681D: Misc/Other. 1681D: Misc/Other.
1682S: 314 Littleton Rd, Westford, MA 01886, USA 1682S: 314 Littleton Rd, Westford, MA 01886, USA
1683 1683
@@ -3211,7 +3211,7 @@ N: James Simmons
3211E: jsimmons@infradead.org 3211E: jsimmons@infradead.org
3212E: jsimmons@users.sf.net 3212E: jsimmons@users.sf.net
3213D: Frame buffer device maintainer 3213D: Frame buffer device maintainer
3214D: input layer developement 3214D: input layer development
3215D: tty/console layer 3215D: tty/console layer
3216D: various mipsel devices 3216D: various mipsel devices
3217S: 115 Carmel Avenue 3217S: 115 Carmel Avenue
@@ -3290,7 +3290,7 @@ S: USA
3290N: Manfred Spraul 3290N: Manfred Spraul
3291E: manfred@colorfullife.com 3291E: manfred@colorfullife.com
3292W: http://www.colorfullife.com/~manfred 3292W: http://www.colorfullife.com/~manfred
3293D: Lots of tiny hacks. Larger improvments to SysV IPC msg, 3293D: Lots of tiny hacks. Larger improvements to SysV IPC msg,
3294D: slab, pipe, select. 3294D: slab, pipe, select.
3295S: 71701 Schwieberdingen 3295S: 71701 Schwieberdingen
3296S: Germany 3296S: Germany