Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
authorDavid S. Miller <davem@davemloft.net>
Mon, 17 Sep 2012 04:49:02 +0000 (00:49 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Sep 2012 04:49:02 +0000 (00:49 -0400)
Jerr Kirsher says:

> This series contains updates to igb (specifically PTP code).

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

Trivial merge