diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2019-01-08 10:50:22 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2019-01-08 10:50:22 +0200 |
| commit | 3eb0930a425b086bdab38156aa4708427479a201 (patch) | |
| tree | ea0bceef5bd1f62e4993f8f2f22a81f9da5f1f09 /include/linux/clk/clk-conf.h | |
| parent | 481975ca235e41560178c8492623d8e06013341a (diff) | |
| parent | bfeffd155283772bbe78c6a05dec7c0128ee500c (diff) | |
Merge drm/drm-next into drm-intel-next-queued
Generally catch up with 5.0-rc1, and specifically get the changes:
96d4f267e40f ("Remove 'type' argument from access_ok() function")
0b2c8f8b6b0c ("i915: fix missing user_access_end() in page fault exception case")
594cc251fdd0 ("make 'user_access_begin()' do 'access_ok()'")
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/linux/clk/clk-conf.h')
| -rw-r--r-- | include/linux/clk/clk-conf.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/clk/clk-conf.h b/include/linux/clk/clk-conf.h index e0c362363c38..85f8cf9d1226 100644 --- a/include/linux/clk/clk-conf.h +++ b/include/linux/clk/clk-conf.h @@ -1,10 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 2014 Samsung Electronics Co., Ltd. * Sylwester Nawrocki <s.nawrocki@samsung.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include <linux/types.h> |