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

Pull OpenRISC update from Jonas Bonn:
 "Trivial cleanups for OpenRISC."

* tag 'for-3.8' of git://openrisc.net/~jonas/linux:
  openrisc: use kbuild.h instead of defining macros in asm-offset.c
  openrisc: Use Kbuild infrastructure for kvm_para.h

diff --combined arch/openrisc/include/asm/Kbuild
index 8971026e1c63fbee30dda6c1992176a63903e115,9430b8c50a0d5ea4c05cea57a03cd87b2e432cd9..f20d01d9aaf973bec2f0affd4cfb4a2117267d47
--- 1/arch/openrisc/include/asm/Kbuild
--- 2/arch/openrisc/include/asm/Kbuild
+++ b/arch/openrisc/include/asm/Kbuild
@@@ -32,6 -32,7 +32,7 @@@ generic-y += ipcbuf.
  generic-y += irq_regs.h
  generic-y += kdebug.h
  generic-y += kmap_types.h
+ generic-y += kvm_para.h
  generic-y += local.h
  generic-y += mman.h
  generic-y += module.h
@@@ -60,7 -61,6 +61,7 @@@ generic-y += swab.
  generic-y += termbits.h
  generic-y += termios.h
  generic-y += topology.h
 +generic-y += trace_clock.h
  generic-y += types.h
  generic-y += ucontext.h
  generic-y += user.h