tree bf07f9f432b0d8e9db9486f1f32ad065c0aa7c5c
parent a4fe91ee711f4e955ea85ab05b092cfe384b073e
parent 93af7aca44f0e82e67bda10a0fb73d383edcc8bd
author David S. Miller <davem@davemloft.net> 1241062235 -0700
committer David S. Miller <davem@davemloft.net> 1241062235 -0700

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

Conflicts:
	Documentation/isdn/00-INDEX
	drivers/net/wireless/iwlwifi/iwl-scan.c
	drivers/net/wireless/rndis_wlan.c
	net/mac80211/main.c