Merge tag 'for-3.13' of git://git.openrisc.net/~jonas/linux

Pull OpenRISC updates from Jonas Bonn:
 - small cleanups to make allmodconfig pass
 - defconfig refresh
 - a handful of code sanitization patches

* tag 'for-3.13' of git://git.openrisc.net/~jonas/linux:
  openrisc: Refactor or32_early_setup()
  openrisc: Remove unused declaration of __initramfs_start
  openrisc: Use the declarations provided by <asm/sections.h>
  openrisc: Refresh or1ksim_defconfig for v3.12
  openrisc: Refactor 16-bit constant relocation
  openrisc: include: asm: Kbuild: add default "vga.h"
  openrisc: Makefile: append "-D__linux__" to KBUILD_CFLAGS

diff --cc arch/openrisc/include/asm/Kbuild
index 78405625e799016b46647db52711c77f5b7ef224,6bdc2701f028b6e7a48cfeea68824541f0d64728..da1951a22907772ec776dde7761c765479b6436a
--- 1/arch/openrisc/include/asm/Kbuild
--- 2/arch/openrisc/include/asm/Kbuild
+++ b/arch/openrisc/include/asm/Kbuild
@@@ -65,6 -65,6 +65,7 @@@ generic-y += trace_clock.
  generic-y += types.h
  generic-y += ucontext.h
  generic-y += user.h
+ generic-y += vga.h
  generic-y += word-at-a-time.h
  generic-y += xor.h
 +generic-y += preempt.h

diff --cc arch/openrisc/kernel/setup.c
Simple merge