diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-08-04 07:59:13 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-04 07:59:13 -0400 |
| commit | 772320e84588dcbe1600ffb83e5f328f2209ac2a (patch) | |
| tree | a7de21b79340aeaa17c58126f6b801b82c77b53a /arch/mips/loongson/common/cs5536/cs5536_pci.c | |
| parent | 1ce53adf13a54375d2a5c7cdbe341b2558389615 (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
Merge commit 'v2.6.35' into kbuild/kbuild
Conflicts:
arch/powerpc/Makefile
Diffstat (limited to 'arch/mips/loongson/common/cs5536/cs5536_pci.c')
| -rw-r--r-- | arch/mips/loongson/common/cs5536/cs5536_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/loongson/common/cs5536/cs5536_pci.c b/arch/mips/loongson/common/cs5536/cs5536_pci.c index e23f3d7d2c1d..6dfeab11af08 100644 --- a/arch/mips/loongson/common/cs5536/cs5536_pci.c +++ b/arch/mips/loongson/common/cs5536/cs5536_pci.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * Author : jlliu, liujl@lemote.com | 5 | * Author : jlliu, liujl@lemote.com |
| 6 | * | 6 | * |
| 7 | * Copyright (C) 2009 Lemote, Inc. | 7 | * Copyright (C) 2009 Lemote, Inc. |
| 8 | * Author: Wu Zhangjin, wuzj@lemote.com | 8 | * Author: Wu Zhangjin, wuzhangjin@gmail.com |
| 9 | * | 9 | * |
| 10 | * This program is free software; you can redistribute it and/or modify it | 10 | * This program is free software; you can redistribute it and/or modify it |
| 11 | * under the terms of the GNU General Public License as published by the | 11 | * under the terms of the GNU General Public License as published by the |