diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-26 09:19:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-26 09:19:13 +0200 |
| commit | 413d63d71b222108d19703f3fd5cf9108652a730 (patch) | |
| tree | 4680de6aebb6430dc5f3d9327f86d65149e6b5ae /sound/pci/cs4281.c | |
| parent | x86/CPU: Align CR3 defines (diff) | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledfo... (diff) | |
| download | linux-413d63d71b222108d19703f3fd5cf9108652a730.tar.xz linux-413d63d71b222108d19703f3fd5cf9108652a730.zip | |
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 'sound/pci/cs4281.c')
0 files changed, 0 insertions, 0 deletions