Merge tag 'for-linus' of git://github.com/gxt/linux
commitc5e35d6c512c43105883043dd62cf7257ec3f9f0
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Nov 2012 19:34:45 +0000 (15 11:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Nov 2012 19:34:45 +0000 (15 11:34 -0800)
tree09905577d6de0d61e751c42774d5f7f2d1257015
parentce95a36bb9dd8bb5de49e69b27238da2f415f230
parentc284464658acab50c67ff65ff3dc9215a0231ad2
Merge tag 'for-linus' of git://github.com/gxt/linux

Pull unicore32 update from Guan Xuetao.

* tag 'for-linus' of git://github.com/gxt/linux:
  arch/unicore32: remove CONFIG_EXPERIMENTAL
  unicore32: switch to generic sys_execve()
  unicore32: switch to generic kernel_thread()/kernel_execve()
  unicore32: Use Kbuild infrastructure for kvm_para.h
  UAPI: (Scripted) Disintegrate arch/unicore32/include/asm
  UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler
  UniCore32-bugfix: fix mismatch return value of __xchg_bad_pointer
  UniCore32 bugfix: add missed CONFIG_ZONE_DMA
  unicore32/mm/fault.c: Port OOM changes to do_pf