941fb62762253774cc6177d0b9172ece5133fe1
parent db5a753bf198ef7a50e17d2ff358adf37efe8648
author David S. Miller <davem@davemloft.net> 1287675785 -0700
committer David S. Miller <davem@davemloft.net> 1287675785 -0700

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

Conflicts:
	net/core/dev.c
¨
uú•+x