diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-11-27 10:54:33 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-11-27 10:54:33 +0100 |
| commit | 1420edf7a3fbc9b8b0bbe24c3724d582dd4def28 (patch) | |
| tree | 919f3adb874b11cb5e4ed2df37a9370847300ea4 /scripts/decode_stacktrace.sh | |
| parent | 517f56839f581618d24f2e67a35738a5c6cbaecb (diff) | |
| parent | 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (diff) | |
| download | cachepc-linux-1420edf7a3fbc9b8b0bbe24c3724d582dd4def28.tar.gz cachepc-linux-1420edf7a3fbc9b8b0bbe24c3724d582dd4def28.zip | |
Merge tag 'v4.15-rc1' into drm-misc-fixes
Linux 4.15-rc1
Pull in the merge window to resync. Dave didn't get his -fixes pull
landed in time, and now there's another rockchip fix pending, so
fast-forwarding isn't possible, hence backmerge.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'scripts/decode_stacktrace.sh')
| -rwxr-xr-x | scripts/decode_stacktrace.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/decode_stacktrace.sh b/scripts/decode_stacktrace.sh index 5206d99ddeb8..64220e36ce3b 100755 --- a/scripts/decode_stacktrace.sh +++ b/scripts/decode_stacktrace.sh @@ -1,4 +1,5 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-2.0 # (c) 2014, Sasha Levin <sasha.levin@oracle.com> #set -x |