Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Mostly simple overlapping changes. For example, David Ahern's adjacency list revamp in 'net-next' conflicted with an adjacency list traversal bug fix in 'net'. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -1359,6 +1359,7 @@ static const struct of_device_id nb8800_dt_ids[] = {
|
||||
},
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, nb8800_dt_ids);
|
||||
|
||||
static int nb8800_probe(struct platform_device *pdev)
|
||||
{
|
||||
|
Reference in New Issue
Block a user