diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-09-04 13:07:35 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-04 13:07:35 (GMT) |
| commit | 3fbb96d275989c604b343b9e39aeea50386756e9 (patch) | |
| tree | 6a066ece039f798f7d5a6b44453fc889e0e1cf8a /arch/m68k/kernel/vmlinux-nommu.lds | |
| parent | 63487589bf96bfd3fb7d5531f2d966f29ffe397d (diff) | |
| parent | 863e99a8c1ea2b0391491904297f57a0f6a1fdd6 (diff) | |
| download | linux-3fbb96d275989c604b343b9e39aeea50386756e9.tar.xz | |
Merge branch 'cleanup/io-pci' into next/cleanup
The io-pci series has gained a merge to resolve a nontrivial
conflict.
* cleanup/io-pci:
ARM: Fix ioremap() of address zero
Also includes an update to Linux 3.6-rc3
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/m68k/kernel/vmlinux-nommu.lds')
| -rw-r--r-- | arch/m68k/kernel/vmlinux-nommu.lds | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m68k/kernel/vmlinux-nommu.lds b/arch/m68k/kernel/vmlinux-nommu.lds index 40e02d9..06a763f 100644 --- a/arch/m68k/kernel/vmlinux-nommu.lds +++ b/arch/m68k/kernel/vmlinux-nommu.lds @@ -78,9 +78,7 @@ SECTIONS { __init_end = .; } - _sbss = .; BSS_SECTION(0, 0, 0) - _ebss = .; _end = .; |