Subject: [PATCH 1/2] Staging: ipack: adapt copyright to CERN guidelines

Adapt the copyright clause to CERN guidelines, as it has the copyright over
them.

Signed-off-by: Samuel Iglesias Gonsalvez <[email protected]>
---
drivers/staging/ipack/carriers/tpci200.c | 7 ++++---
drivers/staging/ipack/carriers/tpci200.h | 7 ++++---
drivers/staging/ipack/devices/ipoctal.c | 7 ++++---
drivers/staging/ipack/devices/ipoctal.h | 7 ++++---
drivers/staging/ipack/devices/scc2698.h | 7 ++++---
drivers/staging/ipack/ipack.c | 4 ++--
drivers/staging/ipack/ipack.h | 4 ++--
7 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/drivers/staging/ipack/carriers/tpci200.c b/drivers/staging/ipack/carriers/tpci200.c
index 31cafff..c1a19b2 100644
--- a/drivers/staging/ipack/carriers/tpci200.c
+++ b/drivers/staging/ipack/carriers/tpci200.c
@@ -2,9 +2,10 @@
* tpci200.c
*
* driver for the TEWS TPCI-200 device
- * Copyright (c) 2009 Nicolas Serafini, EIC2 SA
- * Copyright (c) 2010,2011 Samuel Iglesias Gonsalvez <[email protected]>, CERN
- * Copyright (c) 2012 Samuel Iglesias Gonsalvez <[email protected]>, Igalia
+ *
+ * Copyright (C) 2009-2012 CERN (http://www.cern.ch)
+ * Author: Nicolas Serafini, EIC2 SA
+ * Author: Samuel Iglesias Gonsalvez <[email protected]>
*
* 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
diff --git a/drivers/staging/ipack/carriers/tpci200.h b/drivers/staging/ipack/carriers/tpci200.h
index 982f319..8d9be27 100644
--- a/drivers/staging/ipack/carriers/tpci200.h
+++ b/drivers/staging/ipack/carriers/tpci200.h
@@ -2,9 +2,10 @@
* tpci200.h
*
* driver for the carrier TEWS TPCI-200
- * Copyright (c) 2009 Nicolas Serafini, EIC2 SA
- * Copyright (c) 2010,2011 Samuel Iglesias Gonsalvez <[email protected]>, CERN
- * Copyright (c) 2012 Samuel Iglesias Gonsalvez <[email protected]>, Igalia
+ *
+ * Copyright (C) 2009-2012 CERN (http://www.cern.ch)
+ * Author: Nicolas Serafini, EIC2 SA
+ * Author: Samuel Iglesias Gonsalvez <[email protected]>
*
* 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
diff --git a/drivers/staging/ipack/devices/ipoctal.c b/drivers/staging/ipack/devices/ipoctal.c
index b6a72e6..783f120 100644
--- a/drivers/staging/ipack/devices/ipoctal.c
+++ b/drivers/staging/ipack/devices/ipoctal.c
@@ -2,9 +2,10 @@
* ipoctal.c
*
* driver for the GE IP-OCTAL boards
- * Copyright (c) 2009 Nicolas Serafini, EIC2 SA
- * Copyright (c) 2010,2011 Samuel Iglesias Gonsalvez <[email protected]>, CERN
- * Copyright (c) 2012 Samuel Iglesias Gonsalvez <[email protected]>, Igalia
+ *
+ * Copyright (C) 2009-2012 CERN (http://www.cern.ch)
+ * Author: Nicolas Serafini, EIC2 SA
+ * Author: Samuel Iglesias Gonsalvez <[email protected]>
*
* 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
diff --git a/drivers/staging/ipack/devices/ipoctal.h b/drivers/staging/ipack/devices/ipoctal.h
index c5b4ed4..28f1c42 100644
--- a/drivers/staging/ipack/devices/ipoctal.h
+++ b/drivers/staging/ipack/devices/ipoctal.h
@@ -2,9 +2,10 @@
* ipoctal.h
*
* driver for the IPOCTAL boards
- * Copyright (c) 2009 Nicolas Serafini, EIC2 SA
- * Copyright (c) 2010,2011 Samuel Iglesias Gonsalvez <[email protected]>, CERN
- * Copyright (c) 2012 Samuel Iglesias Gonsalvez <[email protected]>, Igalia
+
+ * Copyright (C) 2009-2012 CERN (http://www.cern.ch)
+ * Author: Nicolas Serafini, EIC2 SA
+ * Author: Samuel Iglesias Gonsalvez <[email protected]>
*
* 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
diff --git a/drivers/staging/ipack/devices/scc2698.h b/drivers/staging/ipack/devices/scc2698.h
index 96e8d8c..2ad6acd 100644
--- a/drivers/staging/ipack/devices/scc2698.h
+++ b/drivers/staging/ipack/devices/scc2698.h
@@ -2,9 +2,10 @@
* scc2698.h
*
* driver for the IPOCTAL boards
- * Copyright (c) 2009 Nicolas Serafini, EIC2 SA
- * Copyright (c) 2010,2011 Samuel Iglesias Gonsalvez <[email protected]>, CERN
- * Copyright (c) 2012 Samuel Iglesias Gonsalvez <[email protected]>, Igalia
+ *
+ * Copyright (C) 2009-2012 CERN (http://www.cern.ch)
+ * Author: Nicolas Serafini, EIC2 SA
+ * Author: Samuel Iglesias Gonsalvez <[email protected]>
*
* 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
diff --git a/drivers/staging/ipack/ipack.c b/drivers/staging/ipack/ipack.c
index 429696b..6d5079d 100644
--- a/drivers/staging/ipack/ipack.c
+++ b/drivers/staging/ipack/ipack.c
@@ -1,8 +1,8 @@
/*
* Industry-pack bus support functions.
*
- * (C) 2011 Samuel Iglesias Gonsalvez <[email protected]>, CERN
- * (C) 2012 Samuel Iglesias Gonsalvez <[email protected]>, Igalia
+ * Copyright (C) 2011-2012 CERN (http://www.cern.ch)
+ * Author: Samuel Iglesias Gonsalvez <[email protected]>
*
* 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
diff --git a/drivers/staging/ipack/ipack.h b/drivers/staging/ipack/ipack.h
index 7ca8789..6760bfa 100644
--- a/drivers/staging/ipack/ipack.h
+++ b/drivers/staging/ipack/ipack.h
@@ -1,8 +1,8 @@
/*
* Industry-pack bus.
*
- * (C) 2011 Samuel Iglesias Gonsalvez <[email protected]>, CERN
- * (C) 2012 Samuel Iglesias Gonsalvez <[email protected]>, Igalia
+ * Copyright (C) 2011-2012 CERN (http://www.cern.ch)
+ * Author: Samuel Iglesias Gonsalvez <[email protected]>
*
* 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
--
1.7.10.4


Subject: [PATCH 2/2] MAINTAINERS: Add maintainers for Industry Pack subsystem

Add Samuel Iglesias Gonsalvez, Jens Taprogge and Greg Kroah-Hartman as
maintainers for the Industry Pack subsystem.

Cc: Jens Taprogge <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Samuel Iglesias Gonsalvez <[email protected]>
---
MAINTAINERS | 11 +++++++++++
1 file changed, 11 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 59203e7..1e052df 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3740,6 +3740,17 @@ M: Stanislaw Gruszka <[email protected]>
S: Maintained
F: drivers/usb/atm/ueagle-atm.c

+INDUSTRY PACK SUBSYSTEM (IPACK)
+M: Samuel Iglesias Gonsalvez <[email protected]>
+M: Jens Taprogge <[email protected]>
+M: Greg Kroah-Hartman <[email protected]>
+L: [email protected]
+W: http://industrypack.sourceforge.net
+S: Maintained
+T: git git://git.code.sf.net/p/industrypack/code
+F: drivers/ipack/
+F: include/linux/ipack*
+
INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
M: Mimi Zohar <[email protected]>
S: Supported
--
1.7.10.4