tree 40f617e25a9364d573e3cd2189c9e7fa56c8a0fe
parent ccb7c7732e2ceb4e81a7806faf1670be9681ccd2
parent 05d17608a69b3ae653ea5c9857283bef3439c733
author David S. Miller <davem@davemloft.net> 1271837665 -0700
committer David S. Miller <davem@davemloft.net> 1271837665 -0700

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-6000.c
	net/core/dev.c