tree 646a1da67dc25654552028225ca4b7a0a8043cc9
parent fba3679d34511c42bf452e89dda457a1219eb43a
parent 72a67a94bcba71a5fddd6b3596a20604d2b5dcd6
author David S. Miller <davem@davemloft.net> 1375591006 -0700
committer David S. Miller <davem@davemloft.net> 1375591006 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Merge net into net-next to setup some infrastructure Eric
Dumazet needs for usbnet changes.

Signed-off-by: David S. Miller <davem@davemloft.net>