tree 93da11bf4ea828611ab5277a7dbadf57724c2b1e
parent daebafed7fef54fcc73d2d01431122cfd578d1e0
parent 4e2fd555199977c5994d1a4d2d3b8761b20ca4c7
author David S. Miller <davem@davemloft.net> 1243240941 -0700
committer David S. Miller <davem@davemloft.net> 1243240941 -0700

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

Conflicts:
	drivers/net/wireless/ath/ath5k/phy.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c