diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-03 12:30:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-03 12:30:12 +0100 |
| commit | 294cbd05e32990c3b1a62be27441fc719edebbab (patch) | |
| tree | 9e543bcfdaa183343f18714a256d3fd5c88d3b5c /arch/powerpc/include/uapi/asm/ps3fb.h | |
| parent | be96b316deff35e119760982c43af74e606fa143 (diff) | |
| parent | 5cb0512c02ecd7e6214e912e4c150f4219ac78e0 (diff) | |
| download | blackbird-op-linux-294cbd05e32990c3b1a62be27441fc719edebbab.tar.gz blackbird-op-linux-294cbd05e32990c3b1a62be27441fc719edebbab.zip | |
Merge branch 'linus' into perf/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/include/uapi/asm/ps3fb.h')
| -rw-r--r-- | arch/powerpc/include/uapi/asm/ps3fb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/uapi/asm/ps3fb.h b/arch/powerpc/include/uapi/asm/ps3fb.h index e7233a849680..fd7e3a0d35d5 100644 --- a/arch/powerpc/include/uapi/asm/ps3fb.h +++ b/arch/powerpc/include/uapi/asm/ps3fb.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * Copyright (C) 2006 Sony Computer Entertainment Inc. * Copyright 2006, 2007 Sony Corporation |
