tree 84010e15b506f0506c15dbf03794dd8b776074ea
parent 6461be3a54f802e00d5dcba3537271f92a90eaf3
parent 66f32a8b97f11ad73d2e7b8c192c55febb20b425
author David S. Miller <davem@davemloft.net> 1313886336 -0700
committer David S. Miller <davem@davemloft.net> 1313886336 -0700

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next

Conflicts:
	drivers/net/ethernet/intel/e1000e/netdev.c