The patch below is for application to the wireless-2.6 ath5k branch, and takes into account the latest driver directory move and file renames. I believe this patch handles all copyright notice issues that SFLC is currently aware of. Based on our extensive research (which is summarized in http://www.softwarefreedom.org/resources/2007/ath5k-code-analysis.html) we found that the copyright holders below also have a copyright on some files; the patch below adds their copyright notices. We encourage future patchers to add their copyright notice (and any appropriate additional licensing notices as needed) into the files when they make patches. We also refer developers to our paper at http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html that recommends ways to incorporate permissive-licensed code like this in a GPL-licensed project like Linux. We at SFLC were all very happy to do this work for the Linux Wireless team and are glad that a favorable outcome for all was reached. I believe I've used all the patch-submission tags correctly based on previous discussions and email exchanges with everyone involved, but I obviously don't patch the kernel often (er, at all :), so if I've made a mistake, please let me know. Changes-licensed-under: ISC Signed-off-by: Richard Fontana <fontana@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Bradley M. Kuhn <bkuhn@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Matt Norwood <norwood@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Karen Sandler <karen@xxxxxxxxxxxxxxxxxxx> Acked-by: Matthew W. S. Bell <mentor@xxxxxxxxxxx> Acked-by: Pavel Roskin <proski@xxxxxxx> Acked-by: Nick Kossifidis <mickflemm@xxxxxxxxx> Acked-by: Jiri Slaby <jirislaby@xxxxxxxxx> Acked-by: Luis Rodriguez <mcgrof@xxxxxxxxxxxxxxxxxx> Acked-by: Michael Taylor <mike.taylor@xxxxxxxxxxx> --- diff --git a/drivers/net/wireless/ath5k/hw.c b/drivers/net/wireless/ath5k/hw.c index a392315..ae4c5b5 100644 --- a/drivers/net/wireless/ath5k/hw.c +++ b/drivers/net/wireless/ath5k/hw.c @@ -1,6 +1,9 @@ /* * Copyright (c) 2004-2007 Reyk Floeter <reyk@xxxxxxxxxxx> * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm@xxxxxxxxx> + * Copyright (c) 2007 Matthew W. S. Bell <mentor@xxxxxxxxxxx> + * Copyright (c) 2007 Luis Rodriguez <mcgrof@xxxxxxxxxxxxxxxxxx> + * Copyright (c) 2007 Pavel Roskin <proski@xxxxxxx> * Copyright (c) 2007 Jiri Slaby <jirislaby@xxxxxxxxx> * * Permission to use, copy, modify, and distribute this software for any diff --git a/drivers/net/wireless/ath5k/hw.h b/drivers/net/wireless/ath5k/hw.h index 55ae849..d48754c 100644 --- a/drivers/net/wireless/ath5k/hw.h +++ b/drivers/net/wireless/ath5k/hw.h @@ -1,6 +1,8 @@ /* * Copyright (c) 2004-2007 Reyk Floeter <reyk@xxxxxxxxxxx> * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm@xxxxxxxxx> + * Copyright (c) 2007 Matthew W. S. Bell <mentor@xxxxxxxxxxx> + * Copyright (c) 2007 Luis Rodriguez <mcgrof@xxxxxxxxxxxxxxxxxx> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/drivers/net/wireless/ath5k/reg.h b/drivers/net/wireless/ath5k/reg.h index d4a8b7b..0a7b312 100644 --- a/drivers/net/wireless/ath5k/reg.h +++ b/drivers/net/wireless/ath5k/reg.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2007 Nick Kossifidis <mickflemm@xxxxxxxxx> * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@xxxxxxxxxxx> + * Copyright (c) 2007 Michael Taylor <mike.taylor@xxxxxxxxxxx> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above - To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
