tree 9efc1e2bf6930851f0224f525b6cde0f5297fa61
parent 0074820978004cc484b132d7a9ce0df414660d9d
parent 9bbc052d5e63512b0ce4e201ea97e12fba9fda82
author David S. Miller <davem@davemloft.net> 1305138375 -0400
committer David 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