tree 546c2ff099b2757e75cf34ddace874f1220f740e
parent 7be6065b39c3f1cfa796667eac1a2170465acc91
parent 13d428afc007fcfcd6deeb215618f54cf9c0cae6
author David S. Miller <davem@davemloft.net> 1227228240 -0800
committer David S. Miller <davem@davemloft.net> 1227228240 -0800

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

Conflicts:

	drivers/net/ixgbe/ixgbe_main.c
	include/net/mac80211.h
	net/phonet/af_phonet.c