summaryrefslogtreecommitdiff
path: root/arch/mips
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-06-03 10:05:18 +0200
committerIngo Molnar <mingo@kernel.org>2015-06-03 10:05:18 +0200
commit34e7724c0767f04f6199f2bd7232e9ab1207e1df (patch)
treee9facc4481cca688b9f2fc35c7a622d6f003eb0f /arch/mips
parentc46a024ea5eb0165114dbbc8c82c29b7bcf66e71 (diff)
parent1e6277de3a23373b89e0affc3d179f2173b857a4 (diff)
parentcad14bb9f8ef8bed42c3118adc0d9756e2aeeaa1 (diff)
parent501b32653ebf49114cccb9afbf9150cf18fd8700 (diff)
parent956079e081427fe0c929eb284ab7e39f9b8e2023 (diff)
Merge branches 'x86/mm', 'x86/build', 'x86/apic' and 'x86/platform' into x86/core, to apply dependent patch
Signed-off-by: Ingo Molnar <mingo@kernel.org>