The patch titled
mmc (mainly): add "or later" clause to licence statement.
has been added to the -mm tree. Its filename is
mmc-mainly-add-or-later-clause-to-licence-statement.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: mmc (mainly): add "or later" clause to licence statement.
From: Pierre Ossman <drzeus@xxxxxxxxx>
Clarify my (Pierre's) position on which GPL versions apply. The patch only
touches the source files where I am the only major author. The people who
have made the minor commits to the files have been contacted and have no
issues with this change.
Signed-off-by: Pierre Ossman <drzeus@xxxxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/i8237.c | 5 +++++
drivers/mmc/sdhci.c | 5 +++--
drivers/mmc/sdhci.h | 5 +++--
drivers/mmc/wbsd.c | 5 +++--
drivers/mmc/wbsd.h | 5 +++--
5 files changed, 17 insertions(+), 8 deletions(-)
diff -puN arch/i386/kernel/i8237.c~mmc-mainly-add-or-later-clause-to-licence-statement arch/i386/kernel/i8237.c
--- a/arch/i386/kernel/i8237.c~mmc-mainly-add-or-later-clause-to-licence-statement
+++ a/arch/i386/kernel/i8237.c
@@ -2,6 +2,11 @@
* i8237.c: 8237A DMA controller suspend functions.
*
* Written by Pierre Ossman, 2005.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
*/
#include <linux/init.h>
diff -puN drivers/mmc/sdhci.c~mmc-mainly-add-or-later-clause-to-licence-statement drivers/mmc/sdhci.c
--- a/drivers/mmc/sdhci.c~mmc-mainly-add-or-later-clause-to-licence-statement
+++ a/drivers/mmc/sdhci.c
@@ -4,8 +4,9 @@
* Copyright (C) 2005-2006 Pierre Ossman, All Rights Reserved.
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
*/
#include <linux/delay.h>
diff -puN drivers/mmc/sdhci.h~mmc-mainly-add-or-later-clause-to-licence-statement drivers/mmc/sdhci.h
--- a/drivers/mmc/sdhci.h~mmc-mainly-add-or-later-clause-to-licence-statement
+++ a/drivers/mmc/sdhci.h
@@ -4,8 +4,9 @@
* Copyright (C) 2005 Pierre Ossman, All Rights Reserved.
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
*/
/*
diff -puN drivers/mmc/wbsd.c~mmc-mainly-add-or-later-clause-to-licence-statement drivers/mmc/wbsd.c
--- a/drivers/mmc/wbsd.c~mmc-mainly-add-or-later-clause-to-licence-statement
+++ a/drivers/mmc/wbsd.c
@@ -4,8 +4,9 @@
* Copyright (C) 2004-2005 Pierre Ossman, All Rights Reserved.
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
*
*
* Warning!
diff -puN drivers/mmc/wbsd.h~mmc-mainly-add-or-later-clause-to-licence-statement drivers/mmc/wbsd.h
--- a/drivers/mmc/wbsd.h~mmc-mainly-add-or-later-clause-to-licence-statement
+++ a/drivers/mmc/wbsd.h
@@ -4,8 +4,9 @@
* Copyright (C) 2004-2005 Pierre Ossman, All Rights Reserved.
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
*/
#define LOCK_CODE 0xAA
_
Patches currently in -mm which might be from drzeus@xxxxxxxxx are
acpi-fix-section-for-cpu-init-functions.patch
git-mmc.patch
mmc-mainly-add-or-later-clause-to-licence-statement.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
