diff options
| author | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 22:03:52 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 22:03:52 -0400 |
| commit | 1aedf2ccc60fade26c46fae12e28664d0da3f199 (patch) | |
| tree | d91083e3079f1ddb942a382ac2b5a7525570ad59 /CREDITS | |
| parent | dfdc58ba354adb80d67c99f7be84f95a8e02e466 (diff) | |
| parent | 1ab9dd0902df4f4ff56fbf672220549090ab28ba (diff) | |
Merge mulgrave-w:git/linux-2.6
Conflicts:
include/linux/blkdev.h
Trivial merge to incorporate tag prototypes.
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 7 |
1 files changed, 7 insertions, 0 deletions
| @@ -2384,6 +2384,13 @@ N: Thomas Molina | |||
| 2384 | E: tmolina@cablespeed.com | 2384 | E: tmolina@cablespeed.com |
| 2385 | D: bug fixes, documentation, minor hackery | 2385 | D: bug fixes, documentation, minor hackery |
| 2386 | 2386 | ||
| 2387 | N: Paul Moore | ||
| 2388 | E: paul.moore@hp.com | ||
| 2389 | D: NetLabel author | ||
| 2390 | S: Hewlett-Packard | ||
| 2391 | S: 110 Spit Brook Road | ||
| 2392 | S: Nashua, NH 03062 | ||
| 2393 | |||
| 2387 | N: James Morris | 2394 | N: James Morris |
| 2388 | E: jmorris@namei.org | 2395 | E: jmorris@namei.org |
| 2389 | W: http://namei.org/ | 2396 | W: http://namei.org/ |