tree ca94478c3df281ab76a3399f5ba6341ade3f5791
parent 1dc0f3c54ce1df957f99c17b145488fd03eb1a59
parent 4b8fe66300acb2fba8b16d62606e0d30204022fc
author David S. Miller <davem@davemloft.net> 1292617642 -0800
committer David S. Miller <davem@davemloft.net> 1292617642 -0800

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

Conflicts:
	drivers/net/bnx2x/bnx2x.h
	drivers/net/wireless/iwlwifi/iwl-1000.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/vhost/vhost.c