tree 4dbf54cc23d2796b278e22fc6f5460b9b451c956
parent 54dceb008ffcbe003bea9017cad1227a83b6fc3f
parent b2238566401f01eb796e75750213c7b0fce396b2
author David S. Miller <davem@davemloft.net> 1215559817 -0700
committer David S. Miller <davem@davemloft.net> 1215559817 -0700

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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-3945.c
	net/mac80211/mlme.c