diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-03-08 19:51:57 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-03-08 19:51:57 -0500 |
| commit | 59603b9ae426e968d452f9325cdcff308573dee7 (patch) | |
| tree | f54c52cbf4874a28f88c65fce659daee20b0f41f /arch/powerpc/boot | |
| parent | 57d54889cd00db2752994b389ba714138652e60c (diff) | |
| parent | a11106544f33c104706ae42d27219a409b67478e (diff) | |
Merge commit 'kumar/next' into merge
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/dts/gef_ppc9a.dts | 4 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/gef_sbc310.dts | 4 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/gef_sbc610.dts | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/boot/dts/gef_ppc9a.dts b/arch/powerpc/boot/dts/gef_ppc9a.dts index 977f260d5e64..83f4b79dff85 100644 --- a/arch/powerpc/boot/dts/gef_ppc9a.dts +++ b/arch/powerpc/boot/dts/gef_ppc9a.dts | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * GE Fanuc PPC9A Device Tree Source | 2 | * GE PPC9A Device Tree Source |
| 3 | * | 3 | * |
| 4 | * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc. | 4 | * Copyright 2008 GE Intelligent Platforms Embedded Systems, Inc. |
| 5 | * | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
| 7 | * under the terms of the GNU General Public License as published by the | 7 | * under the terms of the GNU General Public License as published by the |
diff --git a/arch/powerpc/boot/dts/gef_sbc310.dts b/arch/powerpc/boot/dts/gef_sbc310.dts index 8e4efff3bda1..fc3a331dd392 100644 --- a/arch/powerpc/boot/dts/gef_sbc310.dts +++ b/arch/powerpc/boot/dts/gef_sbc310.dts | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * GE Fanuc SBC310 Device Tree Source | 2 | * GE SBC310 Device Tree Source |
| 3 | * | 3 | * |
| 4 | * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc. | 4 | * Copyright 2008 GE Intelligent Platforms Embedded Systems, Inc. |
| 5 | * | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
| 7 | * under the terms of the GNU General Public License as published by the | 7 | * under the terms of the GNU General Public License as published by the |
diff --git a/arch/powerpc/boot/dts/gef_sbc610.dts b/arch/powerpc/boot/dts/gef_sbc610.dts index bb7060078fb4..c0671cc98125 100644 --- a/arch/powerpc/boot/dts/gef_sbc610.dts +++ b/arch/powerpc/boot/dts/gef_sbc610.dts | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * GE Fanuc SBC610 Device Tree Source | 2 | * GE SBC610 Device Tree Source |
| 3 | * | 3 | * |
| 4 | * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc. | 4 | * Copyright 2008 GE Intelligent Platforms Embedded Systems, Inc. |
| 5 | * | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
| 7 | * under the terms of the GNU General Public License as published by the | 7 | * under the terms of the GNU General Public License as published by the |