diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-02-01 00:41:33 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-02-01 00:41:33 -0800 |
commit | 10a558374f3751cf4eb55143008975641dfc2cf4 (patch) | |
tree | aab0def9d2289f6520ffb62ec4c1d738135447c4 /drivers/staging/greybus/audio_manager.h | |
parent | Input: goodix - use generic touchscreen_properties (diff) | |
parent | Linux 4.15 (diff) | |
download | linux-dev-10a558374f3751cf4eb55143008975641dfc2cf4.tar.xz linux-dev-10a558374f3751cf4eb55143008975641dfc2cf4.zip |
Merge tag 'v4.15' into next
Sync with mainline to get in trackpoint updates and other changes.
Diffstat (limited to 'drivers/staging/greybus/audio_manager.h')
-rw-r--r-- | drivers/staging/greybus/audio_manager.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/greybus/audio_manager.h b/drivers/staging/greybus/audio_manager.h index 5ab8f5e0ed3f..dcb1a20f5ff1 100644 --- a/drivers/staging/greybus/audio_manager.h +++ b/drivers/staging/greybus/audio_manager.h @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Greybus operations * * Copyright 2015-2016 Google Inc. - * - * Released under the GPLv2 only. */ #ifndef _GB_AUDIO_MANAGER_H_ |