diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-01 10:25:06 (GMT) |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-01 10:28:36 (GMT) |
| commit | 68d00bbebb5a48b7a9056a8c03476a71ecbc30a6 (patch) | |
| tree | 95af63041b79c43be37d734da6073fc82070f769 /arch/arm/mach-sa1100/generic.h | |
| parent | ac2cbab21f318e19bc176a7f38a120cec835220f (diff) | |
| parent | 07f4207a305c834f528d08428df4531744e25678 (diff) | |
| download | linux-fsl-qoriq-68d00bbebb5a48b7a9056a8c03476a71ecbc30a6.tar.xz | |
Merge remote-tracking branch 'origin/x86/mm' into x86/mm2
Explicitly merging these two branches due to nontrivial conflicts and
to allow further work.
Resolved Conflicts:
arch/x86/kernel/head32.c
arch/x86/kernel/head64.c
arch/x86/mm/init_64.c
arch/x86/realmode/init.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/arm/mach-sa1100/generic.h')
0 files changed, 0 insertions, 0 deletions