diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-02 03:43:20 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-02 03:43:20 -0500 |
| commit | 65370bdf881e20907e7a53abab9b8c0bc5f60a6b (patch) | |
| tree | 0d32a494e873b7b92dbfab0e67ffeef597ee8108 /include/video/pxa168fb.h | |
| parent | e207552e64ea053a33e856828ad7915484911d06 (diff) | |
| parent | 5cb480f6b488128140c940abff3c36f524a334a8 (diff) | |
Merge branch 'linus' into core/locking
Refresh the topic.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/video/pxa168fb.h')
| -rw-r--r-- | include/video/pxa168fb.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/video/pxa168fb.h b/include/video/pxa168fb.h index 8c2f385a90ea..84cbb1f69ea6 100644 --- a/include/video/pxa168fb.h +++ b/include/video/pxa168fb.h | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/arm/mach-mmp/include/mach/pxa168fb.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2009 Marvell International Ltd. | 2 | * Copyright (C) 2009 Marvell International Ltd. |
| 5 | * | 3 | * |
| 6 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |