diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 12:01:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-27 12:01:51 +0100 |
| commit | 3ddeb51d9c83931c1ca6abf76a38934c5a1ed918 (patch) | |
| tree | fc2efb59d627135ea2199a8a68415b162646b121 /arch/m68k/include/asm/bootinfo_no.h | |
| parent | 5a611268b69f05262936dd177205acbce4471358 (diff) | |
| parent | 5ee810072175042775e39bdd3eaaa68884c27805 (diff) | |
| download | talos-obmc-linux-3ddeb51d9c83931c1ca6abf76a38934c5a1ed918.tar.gz talos-obmc-linux-3ddeb51d9c83931c1ca6abf76a38934c5a1ed918.zip | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'arch/m68k/include/asm/bootinfo_no.h')
| -rw-r--r-- | arch/m68k/include/asm/bootinfo_no.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/bootinfo_no.h b/arch/m68k/include/asm/bootinfo_no.h new file mode 100644 index 000000000000..c12e526f5189 --- /dev/null +++ b/arch/m68k/include/asm/bootinfo_no.h @@ -0,0 +1,2 @@ + +/* Nothing for m68knommu */ |
