diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /.mailmap | |
| parent | 275f165fa970174f8a98205529750e8abb6c0a33 (diff) | |
| parent | a432226614c5616e3cfd211e0acffa0acfb4770c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 2 |
1 files changed, 2 insertions, 0 deletions
| @@ -80,6 +80,8 @@ Nguyen Anh Quynh <aquynh@gmail.com> | |||
| 80 | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 80 | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> |
| 81 | Patrick Mochel <mochel@digitalimplant.org> | 81 | Patrick Mochel <mochel@digitalimplant.org> |
| 82 | Peter A Jonsson <pj@ludd.ltu.se> | 82 | Peter A Jonsson <pj@ludd.ltu.se> |
| 83 | Peter Oruba <peter@oruba.de> | ||
| 84 | Peter Oruba <peter.oruba@amd.com> | ||
| 83 | Praveen BP <praveenbp@ti.com> | 85 | Praveen BP <praveenbp@ti.com> |
| 84 | Rajesh Shah <rajesh.shah@intel.com> | 86 | Rajesh Shah <rajesh.shah@intel.com> |
| 85 | Ralf Baechle <ralf@linux-mips.org> | 87 | Ralf Baechle <ralf@linux-mips.org> |