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

author David S. Miller <davem@davemloft.net>

Wed, 19 Jan 2011 00:28:31 +0000 (16:28 -0800)

committer David S. Miller <davem@davemloft.net>

Wed, 19 Jan 2011 00:28:31 +0000 (16:28 -0800)
author David S. Miller <davem@davemloft.net>
Wed, 19 Jan 2011 00:28:31 +0000 (16:28 -0800)
committer David S. Miller <davem@davemloft.net>
Wed, 19 Jan 2011 00:28:31 +0000 (16:28 -0800)
diff --cc drivers/net/bnx2x/bnx2x.h
Simple merge
diff --cc drivers/net/bnx2x/bnx2x_reg.h
Simple merge
diff --cc drivers/net/gianfar.c
Simple merge
diff --cc net/core/dev.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Wed, 19 Jan 2011 00:28:31 +0000 (16:28 -0800)
committer	David S. Miller <davem@davemloft.net>
	Wed, 19 Jan 2011 00:28:31 +0000 (16:28 -0800)
		1	2
drivers/net/bnx2x/bnx2x.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2x/bnx2x_reg.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	patch \|	diff1 \|	diff2 \|	blob \| history