summaryrefslogtreecommitdiffstats
path: root/net/ipv4/fib_trie.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-03-04 16:40:59 -0500
committerDavid S. Miller <davem@davemloft.net>2015-03-04 16:40:59 -0500
commit3a65f63ff6780d35aec355b440eb39bbfbe1b8f5 (patch)
tree87201129649fab2d1d8b4f6fecb5f74dda0075ec /net/ipv4/fib_trie.c
parentf0126539c73921776327e9d6bbf27e7e08ee0e3a (diff)
parent400aff5da5f2c202e8ff2679005981583234df54 (diff)
Merge tag 'linux-can-next-for-4.1-20150304' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says: ==================== pull-request: can-next 2015-03-04 this is a pull request of 3 patches for net-next/master. Aaron Wu contributes three patches for the blackfin can driver, which cleans up the driver and makes use of more platform independent code. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_trie.c')
0 files changed, 0 insertions, 0 deletions