tree f0866d5f03414e08caf0e15e2ebd3a57f7166138
parent 1d07489aac5cef3fc87312a6883fb9cb8208c657
parent fff6540cbcb56a6ae92d4fd4b0864c8d13a8f932
author Linus Torvalds <torvalds@linux-foundation.org> 1385940833 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1385940833 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Pull UML fixes from Richard Weinberger:
 "Fixes two regressions which got introduced this merge window"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: Build always with -mcmodel=large on 64bit
  um: Rename print_stack_trace to do_stack_trace