tree ebe4134fcc93a6e205e6004b3e652d7a62281651
parent 67da22d23fa6f3324e03bcd0580b914b2e4afbf3
parent 3e4b9459fb0e149c6b74c9e89399a8fc39a92b44
author David S. Miller <davem@davemloft.net> 1342721850 -0700
committer David S. Miller <davem@davemloft.net> 1342721850 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c