diff options
| author | David S. Miller <[email protected]> | 2015-06-11 04:56:25 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2015-06-11 04:56:25 +0000 |
| commit | 43559893be501d41d7833a1a0229c0bbd22b9c5c (patch) | |
| tree | e35ea414296681998b88607d2140f6ef88e61d02 /net/unix/af_unix.c | |
| parent | Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge (diff) | |
| parent | can: cangw: introduce optional uid to reference created routing jobs (diff) | |
| download | kernel-43559893be501d41d7833a1a0229c0bbd22b9c5c.tar.gz kernel-43559893be501d41d7833a1a0229c0bbd22b9c5c.zip | |
Merge tag 'linux-can-next-for-4.2-20150609' 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 two patches for net-next.
The first patch is by Tomas Krcka, he fixes the (currently unused)
register address for acceptance filters. Oliver Hartkopp contributes a
patch for the cangw, where an optional UID is added to reference
routing jobs.
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions