git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

author	John W. Linville <linville@tuxdriver.com>
	Fri, 24 Sep 2010 19:52:34 +0000 (15:52 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 24 Sep 2010 19:52:34 +0000 (15:52 -0400)
commit	29ad2facd47f8e37eab8b156e2c384fa181c8b4a
tree	25d4df186cd631810ff15a8e7d37cb6cdd806cdb	tree \| snapshot (tar.gz zip)
parent	6e5c2b4e8addfaab8ef54dedaf7b607e1585c35b	commit \| diff
parent	cd87a2d3a33d75a646f1aa1aa2ee5bf712d6f963	commit \| diff

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

Conflicts:
drivers/net/wireless/ath/ath5k/base.c
net/mac80211/main.c

Motorola kernel-slsi

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/eeprom.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/txrx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/wext-core.c	diff1 \|	diff2 \|	blob \| history