Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 1 Dec 2013 23:33:53 +0000 (15:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 1 Dec 2013 23:33:53 +0000 (15:33 -0800)
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


Trivial merge