linux-next: tip-core merge conflict

Stephen Rothwell
2008-06-10T02:09:09Z

[-- Attachment #1: Type: text/plain, Size: 493 bytes --]

Hi all,

Today's merge of the tip-core tree got a trivial conflict in
include/asm-generic/vmlinux.lds.h between commit
f1cb2ba8ca4a8b4b76bbf0b795375af52442501b ("generic: add
OUTPUT_DATA_SECTION to vmlinux.lds.h") from the kbuild-current tree and
commit 6360b1fbb4a939efd34fc770c2ebd927c55506e0 ("move BUG_TABLE into
RODATA") from the tip-core tree.

I did the obvious fixup.