diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-05-09 22:12:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-09 22:12:17 -0400 |
| commit | 43996fdd9b5409dea7bdc73d8fe4e22ca25ccc39 (patch) | |
| tree | ae8fa8391499bbbad75b0a0bf79523f20a6baa78 /net/unix/af_unix.c | |
| parent | net: macb: Add change_mtu callback with jumbo support (diff) | |
| parent | can: flexcan: replace open coded "mailbox code" by proper define (diff) | |
| download | wireguard-linux-43996fdd9b5409dea7bdc73d8fe4e22ca25ccc39.tar.xz wireguard-linux-43996fdd9b5409dea7bdc73d8fe4e22ca25ccc39.zip | |
Merge tag 'linux-can-next-for-4.2-20150506' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2015-05-06
this is a pull request of a seven patches for net-next/master.
Andreas Gröger contributes two patches for the janz-ican3 driver. In
the first patch, the documentation for already existing sysfs entries
is added, the second patch adds support for another module/firmware
variant. A patch by Shawn Landden makes the padding in the struct
can_frame explicit. The next 4 patches target the flexcan driver, the
first one is by David Jander adding some documentation, the reaming
three by me add more documentation and two small code cleanups.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions