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)
commite97563989a609296c3cbf5b6d8c8dc0a3e47b00b
tree7db7e277af689757e597bddf3704ce60f8d5727b
parentb48b63a1f6e26b0dec2c9f1690396ed4bcb66903
parent4ffdf91a5feae6f0f1486d038fcbba461345fa62
Merge branch 'master' of git://git./linux/kernel/git/jkirsher/net-next

Jerr Kirsher says:

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

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