Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 18 Nov 2012 03:00:43 +0000 (22:00 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 18 Nov 2012 03:00:43 +0000 (22:00 -0500)
Minor line offset auto-merges.

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

Trivial merge