id S. Miller <davem@davemloft.net> 1305138418 -0400

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

Conflicts:
	drivers/net/benet/be_main.c
ßé{