diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-04-08 07:01:54 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-04-08 07:01:54 (GMT) |
| commit | 4bcc7827b02feea2c762fa6d46a1bffb300d7403 (patch) | |
| tree | 45fd2b64247cd44201fe519720494d4bf01b7014 /arch/arm/mach-ep93xx/adssphere.c | |
| parent | 3f705dfdf85a6416f5f12e52b7610144a99cbedc (diff) | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
| download | linux-4bcc7827b02feea2c762fa6d46a1bffb300d7403.tar.xz | |
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 'arch/arm/mach-ep93xx/adssphere.c')
0 files changed, 0 insertions, 0 deletions