Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 4 Aug 2013 04:36:46 +0000 (21:36 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 4 Aug 2013 04:36:46 +0000 (21:36 -0700)
Merge net into net-next to setup some infrastructure Eric
Dumazet needs for usbnet changes.

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

Trivial merge