tree 9b0e062d3677d50d731ffd0fba47423bfdee9253
parent 3ac38c3a2e7dac3f8f35a56eb85c27881a4c3833
parent f21f237cf55494c3a4209de323281a3b0528da10
author David S. Miller <davem@davemloft.net> 1226446982 -0800
committer David S. Miller <davem@davemloft.net> 1226446982 -0800

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

Conflicts:

	drivers/message/fusion/mptlan.c
	drivers/net/sfc/ethtool.c
	net/mac80211/debugfs_sta.c