aboutsummaryrefslogtreecommitdiff
path: root/net/unix/af_unix.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-01-26 10:49:12 -0500
committerDavid S. Miller <davem@davemloft.net>2018-01-26 10:49:12 -0500
commite2d6e64bc3a3949f148476de656e515feffc1d22 (patch)
treed983b0c067cdb4357ffeea5cfe6ce9f7547bffa8 /net/unix/af_unix.c
parent72a231b7a7c801d413fb3aacaff04af6457a59b7 (diff)
parent216bf2f490c214b8a0702b52cc957138ba24bc3f (diff)
downloadlinux-e2d6e64bc3a3949f148476de656e515feffc1d22.tar.gz
linux-e2d6e64bc3a3949f148476de656e515feffc1d22.tar.bz2
linux-e2d6e64bc3a3949f148476de656e515feffc1d22.zip
Merge tag 'linux-can-next-for-4.16-20180126' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says: ==================== pull-request: can-next 2018-01-26 this is a pull request for net-next/master consisting of 3 patches. The first two patches target the CAN documentation. The first is by me and fixes pointer to location of fsl,mpc5200-mscan node in the mpc5200 documentation. The second patch is by Robert Schwebel and it converts the plain ASCII documentation to restructured text. The third patch is by Fabrizio Castro add the r8a774[35] support to the rcar_can dt-bindings documentation. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions