diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-23 11:13:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-23 11:13:15 +0100 |
| commit | e4518ab90f63cd5bea3ddc15341162debc34442b (patch) | |
| tree | fcefaeced9562de840bbf11ec2ffc95e1d9a571f /arch/arm/boot/dts/integratorap.dts | |
| parent | x86/asm/entry, perf: Fix incorrect TIF_IA32 check in code_segment_base() (diff) | |
| parent | Linux 4.0-rc5 (diff) | |
| download | linux-e4518ab90f63cd5bea3ddc15341162debc34442b.tar.xz linux-e4518ab90f63cd5bea3ddc15341162debc34442b.zip | |
Merge tag 'v4.0-rc5' into x86/asm, to resolve conflicts
Conflicts:
arch/x86/kernel/entry_64.S
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/integratorap.dts')
0 files changed, 0 insertions, 0 deletions