diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-26 10:19:13 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-26 10:19:13 +0300 |
| commit | 413d63d71b222108d19703f3fd5cf9108652a730 (patch) | |
| tree | 4680de6aebb6430dc5f3d9327f86d65149e6b5ae /drivers/staging/Kconfig | |
| parent | d6c8103b0265d8db30e20e948a4f06382bbdaea7 (diff) | |
| parent | 90a6cd503982bfd33ce8c70eb49bd2dd33bc6325 (diff) | |
| download | linux-413d63d71b222108d19703f3fd5cf9108652a730.tar.xz | |
Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts
Conflicts:
arch/x86/kernel/head64.c
arch/x86/mm/mmap.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/staging/Kconfig')
| -rw-r--r-- | drivers/staging/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 268d4e6ef48a..ef28a1cb64ae 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -110,4 +110,6 @@ source "drivers/staging/ccree/Kconfig" source "drivers/staging/typec/Kconfig" +source "drivers/staging/vboxvideo/Kconfig" + endif # STAGING |