diff --git a/[refs] b/[refs] index 84ec99612821..3e7f63638a0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 416289b14a8ab1a0fea7b7ee03724c4820578427 +refs/heads/master: b995069af54cf1cf0de19ff440a93e528ea993de diff --git a/trunk/drivers/staging/ipack/bridges/tpci200.c b/trunk/drivers/staging/ipack/bridges/tpci200.c index 08cd85150ef2..80cdd9ec2ba6 100644 --- a/trunk/drivers/staging/ipack/bridges/tpci200.c +++ b/trunk/drivers/staging/ipack/bridges/tpci200.c @@ -8,8 +8,7 @@ * * 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. + * Software Foundation; version 2 of the License. */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt diff --git a/trunk/drivers/staging/ipack/bridges/tpci200.h b/trunk/drivers/staging/ipack/bridges/tpci200.h index e452da2f17f7..75801f6cf68c 100644 --- a/trunk/drivers/staging/ipack/bridges/tpci200.h +++ b/trunk/drivers/staging/ipack/bridges/tpci200.h @@ -8,8 +8,7 @@ * * 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. + * Software Foundation; version 2 of the License. */ #ifndef _TPCI200_H_