6 files changed, 16 insertions, 20 deletions
diff --git a/Documentation/DocBook/dma.tmpl b/Documentation/DocBook/dma.tmpl
index 7f14674a34b..5ac6ebeee8a 100644
--- a/Documentation/DocBook/dma.tmpl
+++ b/Documentation/DocBook/dma.tmpl
@@ -7,8 +7,8 @@
   <title>API Documentation for DMA controller driver</title>
 
   <copyright>
-   <year>2008-2009</year>
-   <holder>STMicroelectronics Pvt Ltd</holder>
+   <year>2009-2010</year>
+   <holder>ST-Ericsson</holder>
   </copyright>
 
   <legalnotice>
diff --git a/Documentation/DocBook/i2c.tmpl b/Documentation/DocBook/i2c.tmpl
index f6cd90a7b31..5778f8350f3 100644
--- a/Documentation/DocBook/i2c.tmpl
+++ b/Documentation/DocBook/i2c.tmpl
@@ -7,8 +7,8 @@
   <title>API Documentation for I2C controller driver</title>
 
   <copyright>
-   <year>2008-2009</year>
-   <holder>STMicroelectronics Pvt Ltd</holder>
+   <year>2009-2010</year>
+   <holder>ST-Ericsson</holder>
   </copyright>
 
   <legalnotice>
diff --git a/arch/arm/mach-ux500/dma_40.c b/arch/arm/mach-ux500/dma_40.c
index a3e5be284e0..13d19c3cb62 100755
--- a/arch/arm/mach-ux500/dma_40.c
+++ b/arch/arm/mach-ux500/dma_40.c
@@ -1,5 +1,6 @@
 /*----------------------------------------------------------------------------*/
 /* Copyright STMicroelectronics, 2008.                                        */
+/* Copyright (C) ST-Ericsson SA 2009					      */
 /*                                                                            */
 /* 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/arch/arm/mach-ux500/include/mach/dma_40-8500.h b/arch/arm/mach-ux500/include/mach/dma_40-8500.h
index 4858609ad62..e104928b336 100755
--- a/arch/arm/mach-ux500/include/mach/dma_40-8500.h
+++ b/arch/arm/mach-ux500/include/mach/dma_40-8500.h
@@ -1,5 +1,6 @@
 /*----------------------------------------------------------------------------*/
-/*   copyright STMicroelectronics, 2008.                                      */
+/* copyright STMicroelectronics, 2008.                                        */
+/* Copyright (C) ST-Ericsson SA 2009					      */
 /*                                                                            */
 /* 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       */
diff --git a/arch/arm/mach-ux500/include/mach/timex.h b/arch/arm/mach-ux500/include/mach/timex.h
index d43d0d73fbc..9df87d8059b 100755
--- a/arch/arm/mach-ux500/include/mach/timex.h
+++ b/arch/arm/mach-ux500/include/mach/timex.h
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2009
+ * Author: Rabin Vincent <rabin.vincent@stericsson.com>
+ * License terms: GNU General Public License (GPL) version 2
+ */
+
 #ifndef __ASM_ARCH_TIMEX_H
 #define __ASM_ARCH_TIMEX_H
 
diff --git a/drivers/misc/i2s/i2s_test_protocol_driver.c b/drivers/misc/i2s/i2s_test_protocol_driver.c
index 7f16cf371eb..a8721785ae9 100644
--- a/drivers/misc/i2s/i2s_test_protocol_driver.c
+++ b/drivers/misc/i2s/i2s_test_protocol_driver.c
@@ -1,19 +1,7 @@
 /*
- * i2s_test_protocol_driver.c -- simple test protocol driver to I2S devices
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Copyright (C) ST-Ericsson SA 2009
+ * Author: Sandeep Kaushik, <sandeep-mmc.kaushik@st.com>
+ * License terms: GNU General Public License (GPL) version 2
  */
 
 #include <linux/init.h>