diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
| commit | 617677295b53a40d0e54aac4cbbc216ffbc755dd (patch) | |
| tree | 51b9e87213243ed5efff252c8e8d8fec4eebc588 /arch/powerpc/sysdev/qe_lib/ucc.c | |
| parent | 5c8d1b68e01a144813e38795fe6dbe7ebb506131 (diff) | |
| parent | 6abb7c25775b7fb2225ad0508236d63ca710e65f (diff) | |
Merge branch 'master' into for-next
Conflicts:
drivers/devfreq/exynos4_bus.c
Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
Diffstat (limited to 'arch/powerpc/sysdev/qe_lib/ucc.c')
| -rw-r--r-- | arch/powerpc/sysdev/qe_lib/ucc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/qe_lib/ucc.c b/arch/powerpc/sysdev/qe_lib/ucc.c index 04677505f20f..134b07d29435 100644 --- a/arch/powerpc/sysdev/qe_lib/ucc.c +++ b/arch/powerpc/sysdev/qe_lib/ucc.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * QE UCC API Set - UCC specific routines implementations. | 4 | * QE UCC API Set - UCC specific routines implementations. |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2006 Freescale Semicondutor, Inc. All rights reserved. | 6 | * Copyright (C) 2006 Freescale Semiconductor, Inc. All rights reserved. |
| 7 | * | 7 | * |
| 8 | * Authors: Shlomi Gridish <gridish@freescale.com> | 8 | * Authors: Shlomi Gridish <gridish@freescale.com> |
| 9 | * Li Yang <leoli@freescale.com> | 9 | * Li Yang <leoli@freescale.com> |