diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-03-13 23:36:52 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-03-13 23:36:52 -0500 |
| commit | 58a343f22e8ef987b90e34bbef7f1455e3bb5a15 (patch) | |
| tree | fc811fb570639f2083df6d9191b6a8d7cff65352 /CREDITS | |
| parent | 51c38f9bce274a1e8a90aa457fb433be738f7458 (diff) | |
| parent | 3759fa9c55923f719ae944a3f8fbb029b36f759d (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 6 |
1 files changed, 2 insertions, 4 deletions
| @@ -3643,11 +3643,9 @@ S: Cambridge. CB1 7EG | |||
| 3643 | S: England | 3643 | S: England |
| 3644 | 3644 | ||
| 3645 | N: Chris Wright | 3645 | N: Chris Wright |
| 3646 | E: chrisw@osdl.org | 3646 | E: chrisw@sous-sol.org |
| 3647 | D: hacking on LSM framework and security modules. | 3647 | D: hacking on LSM framework and security modules. |
| 3648 | S: c/o OSDL | 3648 | S: Portland, OR |
| 3649 | S: 12725 SW Millikan Way, Suite 400 | ||
| 3650 | S: Beaverton, OR 97005 | ||
| 3651 | S: USA | 3649 | S: USA |
| 3652 | 3650 | ||
| 3653 | N: Michal Wronski | 3651 | N: Michal Wronski |