diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/mips/power | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/mips/power')
| -rw-r--r-- | arch/mips/power/cpu.c | 4 | ||||
| -rw-r--r-- | arch/mips/power/hibernate.S | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/power/cpu.c b/arch/mips/power/cpu.c index 7995df45dc8d..26a6ef19d71f 100644 --- a/arch/mips/power/cpu.c +++ b/arch/mips/power/cpu.c | |||
| @@ -3,9 +3,9 @@ | |||
| 3 | * | 3 | * |
| 4 | * Licensed under the GPLv2 | 4 | * Licensed under the GPLv2 |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 Lemote Inc. & Insititute of Computing Technology | 6 | * Copyright (C) 2009 Lemote Inc. |
| 7 | * Author: Hu Hongbing <huhb@lemote.com> | 7 | * Author: Hu Hongbing <huhb@lemote.com> |
| 8 | * Wu Zhangjin <wuzj@lemote.com> | 8 | * Wu Zhangjin <wuzhangjin@gmail.com> |
| 9 | */ | 9 | */ |
| 10 | #include <asm/suspend.h> | 10 | #include <asm/suspend.h> |
| 11 | #include <asm/fpu.h> | 11 | #include <asm/fpu.h> |
diff --git a/arch/mips/power/hibernate.S b/arch/mips/power/hibernate.S index 0cf86fb32ec3..dbb5c7b4b70f 100644 --- a/arch/mips/power/hibernate.S +++ b/arch/mips/power/hibernate.S | |||
| @@ -3,9 +3,9 @@ | |||
| 3 | * | 3 | * |
| 4 | * Licensed under the GPLv2 | 4 | * Licensed under the GPLv2 |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 Lemote Inc. & Insititute of Computing Technology | 6 | * Copyright (C) 2009 Lemote Inc. |
| 7 | * Author: Hu Hongbing <huhb@lemote.com> | 7 | * Author: Hu Hongbing <huhb@lemote.com> |
| 8 | * Wu Zhangjin <wuzj@lemote.com> | 8 | * Wu Zhangjin <wuzhangjin@gmail.com> |
| 9 | */ | 9 | */ |
| 10 | #include <asm/asm-offsets.h> | 10 | #include <asm/asm-offsets.h> |
| 11 | #include <asm/page.h> | 11 | #include <asm/page.h> |