tree c25d5b0e49ec848943d35f819e748d157ccb492e
parent c4949f074332a64baeb2ead6ab9319ca37642f96
parent c02db8c6290bb992442fec1407643c94cc414375
author David S. Miller <davem@davemloft.net> 1274074018 -0700
committer David S. Miller <davem@davemloft.net> 1274074018 -0700

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

Conflicts:
	include/linux/if_link.h