* [PATCH] net: pxa168_etc.c recognize additional contributors
@ 2010-09-28 14:26 Philip Rakity
2010-10-01 0:33 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Philip Rakity @ 2010-09-28 14:26 UTC (permalink / raw)
To: netdev@vger.kernel.org; +Cc: Mark Brown, Sachin Sanap
Signed-off-by: Philip Rakity <prakity@marvell.com>
Signed-off-by: Sachin Sanap <ssanap@marvell.com>
Signed-off-by: Mark Brown <markb@marvell.com>
---
drivers/net/pxa168_eth.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/pxa168_eth.c b/drivers/net/pxa168_eth.c
index c6eeb38..0f2d41b 100644
--- a/drivers/net/pxa168_eth.c
+++ b/drivers/net/pxa168_eth.c
@@ -4,8 +4,10 @@
*
* Copyright (C) 2010 Marvell International Ltd.
* Sachin Sanap <ssanap@marvell.com>
+ * Zhangfei Gao <zgao6@marvell.com>
* Philip Rakity <prakity@marvell.com>
* Mark Brown <markb@marvell.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
--
1.6.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: pxa168_etc.c recognize additional contributors
2010-09-28 14:26 [PATCH] net: pxa168_etc.c recognize additional contributors Philip Rakity
@ 2010-10-01 0:33 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-10-01 0:33 UTC (permalink / raw)
To: prakity; +Cc: netdev, markb, ssanap
From: Philip Rakity <prakity@marvell.com>
Date: Tue, 28 Sep 2010 07:26:30 -0700
> Signed-off-by: Philip Rakity <prakity@marvell.com>
> Signed-off-by: Sachin Sanap <ssanap@marvell.com>
> Signed-off-by: Mark Brown <markb@marvell.com>
Your patch is corrupted, did you try to edit it by hand
in something like emacs?
> diff --git a/drivers/net/pxa168_eth.c b/drivers/net/pxa168_eth.c
> index c6eeb38..0f2d41b 100644
> --- a/drivers/net/pxa168_eth.c
> +++ b/drivers/net/pxa168_eth.c
> @@ -4,8 +4,10 @@
This hunk header says there are 8 lines in the hunk beforehand
and 10 lines afterwards.
> *
> * Copyright (C) 2010 Marvell International Ltd.
> * Sachin Sanap <ssanap@marvell.com>
> + * Zhangfei Gao <zgao6@marvell.com>
> * Philip Rakity <prakity@marvell.com>
> * Mark Brown <markb@marvell.com>
> *
> * This program is free software; you can redistribute it and/or
> * modify it under the terms of the GNU General Public License
> --
> 1.6.0.4
But clearly there are 8 beforehand and 9 afterwards.
Anyways I fixed this up and added your change, but please be
more careful in the future.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-10-01 0:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-28 14:26 [PATCH] net: pxa168_etc.c recognize additional contributors Philip Rakity
2010-10-01 0:33 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).