tree 17bb60f68ee299d9717038197a932501625f1621
parent a33bc5c15154c835aae26f16e6a3a7d9ad4acb45
parent 0a924578bc4a2823a95c151f56975c71f5c156bb
author David S. Miller <davem@davemloft.net> 1249006963 -0700
committer David S. Miller <davem@davemloft.net> 1249006963 -0700

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-3945.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c