diff --git a/[refs] b/[refs]
index d2765aa767be..84ec99612821 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91296a28fd241877e8214bf45d1eb2c866cc771a
+refs/heads/master: 416289b14a8ab1a0fea7b7ee03724c4820578427
diff --git a/trunk/drivers/staging/ipack/ipack.c b/trunk/drivers/staging/ipack/ipack.c
index a54bfd7c25e1..ad06e06bdc74 100644
--- a/trunk/drivers/staging/ipack/ipack.c
+++ b/trunk/drivers/staging/ipack/ipack.c
@@ -6,8 +6,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/ipack.h b/trunk/drivers/staging/ipack/ipack.h
index 41d61726f317..3aa38c511abe 100644
--- a/trunk/drivers/staging/ipack/ipack.h
+++ b/trunk/drivers/staging/ipack/ipack.h
@@ -6,8 +6,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.
  */
 
 #include <linux/device.h>