tree 41ba194e687c6c60f5c883f98737ac83257d0c00
parent 1d1652cbdb9885e4d73972263e4cdbe1b0beebfe
parent 7cc31a9ae1477abc79d5992b3afe889f25c50c99
author David S. Miller <davem@davemloft.net> 1305667991 -0400
committer David S. Miller <davem@davemloft.net> 1305667991 -0400

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

Conflicts:
	drivers/net/vmxnet3/vmxnet3_ethtool.c
	net/core/dev.c