]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branch 'rebased-net-ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorDavid S. Miller <davem@davemloft.net>
Thu, 25 Jan 2018 04:48:11 +0000 (23:48 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 25 Jan 2018 04:48:11 +0000 (23:48 -0500)
Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge