diff options
author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /CREDITS | |
parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (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-- | CREDITS | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1677,7 +1677,7 @@ W: http://www.codemonkey.org.uk | |||
1677 | D: Assorted VIA x86 support. | 1677 | D: Assorted VIA x86 support. |
1678 | D: 2.5 AGPGART overhaul. | 1678 | D: 2.5 AGPGART overhaul. |
1679 | D: CPUFREQ maintenance. | 1679 | D: CPUFREQ maintenance. |
1680 | D: Fedora kernel maintainence. | 1680 | D: Fedora kernel maintenance. |
1681 | D: Misc/Other. | 1681 | D: Misc/Other. |
1682 | S: 314 Littleton Rd, Westford, MA 01886, USA | 1682 | S: 314 Littleton Rd, Westford, MA 01886, USA |
1683 | 1683 | ||
@@ -3211,7 +3211,7 @@ N: James Simmons | |||
3211 | E: jsimmons@infradead.org | 3211 | E: jsimmons@infradead.org |
3212 | E: jsimmons@users.sf.net | 3212 | E: jsimmons@users.sf.net |
3213 | D: Frame buffer device maintainer | 3213 | D: Frame buffer device maintainer |
3214 | D: input layer developement | 3214 | D: input layer development |
3215 | D: tty/console layer | 3215 | D: tty/console layer |
3216 | D: various mipsel devices | 3216 | D: various mipsel devices |
3217 | S: 115 Carmel Avenue | 3217 | S: 115 Carmel Avenue |
@@ -3290,7 +3290,7 @@ S: USA | |||
3290 | N: Manfred Spraul | 3290 | N: Manfred Spraul |
3291 | E: manfred@colorfullife.com | 3291 | E: manfred@colorfullife.com |
3292 | W: http://www.colorfullife.com/~manfred | 3292 | W: http://www.colorfullife.com/~manfred |
3293 | D: Lots of tiny hacks. Larger improvments to SysV IPC msg, | 3293 | D: Lots of tiny hacks. Larger improvements to SysV IPC msg, |
3294 | D: slab, pipe, select. | 3294 | D: slab, pipe, select. |
3295 | S: 71701 Schwieberdingen | 3295 | S: 71701 Schwieberdingen |
3296 | S: Germany | 3296 | S: Germany |