Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 30 Nov 2014 04:47:48 +0000 (20:47 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 30 Nov 2014 04:47:48 +0000 (20:47 -0800)

Trivial merge