diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-04-08 09:01:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-04-08 09:01:54 +0200 |
| commit | 4bcc7827b02feea2c762fa6d46a1bffb300d7403 (patch) | |
| tree | 45fd2b64247cd44201fe519720494d4bf01b7014 /net/switchdev | |
| parent | x86, selftests: Add sigreturn selftest (diff) | |
| parent | Linux 4.0-rc7 (diff) | |
| download | linux-4bcc7827b02feea2c762fa6d46a1bffb300d7403.tar.xz linux-4bcc7827b02feea2c762fa6d46a1bffb300d7403.zip | |
Merge tag 'v4.0-rc7' into x86/asm, to resolve conflicts
Conflicts:
arch/x86/kernel/entry_64.S
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/switchdev')
0 files changed, 0 insertions, 0 deletions