aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds2013-03-11 07:50:39 -0700
committerLinus Torvalds2013-03-11 07:50:39 -0700
commitffb6a445e7cdc03d67f8b9fb2f5afaafd8260b4b (patch)
tree931c3c2f1dc483539d2349f05c9bbf1e4447c41f /net
parent152fcb2784c9305e19e7caee2932b9e32b0a1d41 (diff)
parent2116bda6ad937d7acb6e2316fd9e65ad6ca01d42 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions