diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
| commit | 492b057c426e4aa747484958e18e9da29003985d (patch) | |
| tree | 34e08c24618688d8bcc190523028b5f94cce0c0b /CREDITS | |
| parent | 313485175da221c388f6a8ecf4c30062ba9bea17 (diff) | |
| parent | 300df7dc89cc276377fc020704e34875d5c473b6 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 4 |
1 files changed, 4 insertions, 0 deletions
| @@ -1253,6 +1253,10 @@ S: 8124 Constitution Apt. 7 | |||
| 1253 | S: Sterling Heights, Michigan 48313 | 1253 | S: Sterling Heights, Michigan 48313 |
| 1254 | S: USA | 1254 | S: USA |
| 1255 | 1255 | ||
| 1256 | N: Wolfgang Grandegger | ||
| 1257 | E: wg@grandegger.com | ||
| 1258 | D: Controller Area Network (device drivers) | ||
| 1259 | |||
| 1256 | N: William Greathouse | 1260 | N: William Greathouse |
| 1257 | E: wgreathouse@smva.com | 1261 | E: wgreathouse@smva.com |
| 1258 | E: wgreathouse@myfavoritei.com | 1262 | E: wgreathouse@myfavoritei.com |