diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-09 22:34:25 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 22:34:25 +0200 |
commit | f974a8ec96571535ee07880a023bcce0e3f2c76b (patch) | |
tree | 5cf09207b1ad292a55275cd0b24999fa29b9dfe8 /drivers/net/bnx2x.h | |
parent | [ARM] 5143/1: pxa: further cleanup PXA Kconfig by removing one (diff) | |
parent | [ARM] mach-types update (diff) | |
download | linux-f974a8ec96571535ee07880a023bcce0e3f2c76b.tar.xz linux-f974a8ec96571535ee07880a023bcce0e3f2c76b.zip |
Merge branch 'machtypes' into pxa-palm
Diffstat (limited to 'drivers/net/bnx2x.h')
-rw-r--r-- | drivers/net/bnx2x.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h index 4f0c0d31e7c1..8e68d06510a6 100644 --- a/drivers/net/bnx2x.h +++ b/drivers/net/bnx2x.h @@ -6,7 +6,8 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation. * - * Written by: Eliezer Tamir <eliezert@broadcom.com> + * Maintained by: Eilon Greenstein <eilong@broadcom.com> + * Written by: Eliezer Tamir * Based on code from Michael Chan's bnx2 driver */ |