diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-10 21:56:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-10 21:56:25 -0700 |
| commit | 43559893be501d41d7833a1a0229c0bbd22b9c5c (patch) | |
| tree | e35ea414296681998b88607d2140f6ef88e61d02 /net/bridge/br_fdb.c | |
| parent | c3eee1fb1d308564ada5f7ea57bc51efc6130b37 (diff) | |
| parent | dd895d7f21b244e7fd4c7477697e274de7e44ecb (diff) | |
| download | linux-stable-43559893be501d41d7833a1a0229c0bbd22b9c5c.tar.gz linux-stable-43559893be501d41d7833a1a0229c0bbd22b9c5c.tar.bz2 linux-stable-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 <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_fdb.c')
0 files changed, 0 insertions, 0 deletions