iller <davem@davemloft.net> 1318528806 -0400

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next