From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 Mar 2013 14:50:39 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
X-Git-Tag: firefly_0821_release~3680^2~922
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=ffb6a445e7cdc03d67f8b9fb2f5afaafd8260b4b;p=firefly-linux-kernel-4.4.55.git

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

Pull UML fixes from Richard Weinberger:
 "This update brings various fixes.
  Nothing special...

  In my local queue I have some more fixes which will be sent later to
  you.  3.9 uncovered strange UML issues.  :("

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: Use tty_port in SIGWINCH handler
  um: Use tty_port_operations->destruct
  um: fix build failure due to mess-up of sig_info protorype
  um: add missing declaration of 'getrlimit()' and friends
  net : enable tx time stamping in the vde driver.
  hostfs: fix a not needed double check
---

ffb6a445e7cdc03d67f8b9fb2f5afaafd8260b4b