diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2017-12-08 10:15:30 -0800 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2017-12-08 10:15:30 -0800 |
| commit | 6647852abc1fd74e9c5e0dcf404ea4cb9c929630 (patch) | |
| tree | 371aa801a5a211f5f8af87bd5488e3dae75ea975 /kernel/sysctl_binary.c | |
| parent | 3e72be177cf19ab3d62b3084d424dce7e71d847f (diff) | |
| parent | 3f1f0b1c57dd617e9b0ded50efb8d6c011b85b20 (diff) | |
| download | linux-6647852abc1fd74e9c5e0dcf404ea4cb9c929630.tar.gz linux-6647852abc1fd74e9c5e0dcf404ea4cb9c929630.zip | |
Merge airlied/drm-next into drm-intel-next-queued
Chris requested this backmerge for a reconciliation on
drm_print.h between drm-misc-next and drm-intel-next-queued
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'kernel/sysctl_binary.c')
| -rw-r--r-- | kernel/sysctl_binary.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c index 58ea8c03662e..e8c0dab4fd65 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/stat.h> #include <linux/sysctl.h> #include "../fs/xfs/xfs_sysctl.h" |