tree cf958678f7cf0b615a52356beb2d18240424ab4a
parent 4a6967b88af02eebeedfbb91bc09160750225bb5
parent a120e912eb51e347f36c71b60a1d13af74d30e83
author John W. Linville <linville@tuxdriver.com> 1267221285 -0500
committer John W. Linville <linville@tuxdriver.com> 1267221285 -0500

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-core.h
	net/mac80211/rate.c