Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 13 Jul 2010 19:57:29 +0000 (15:57 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 13 Jul 2010 19:57:29 +0000 (15:57 -0400)
commite300d955debdadf599c36e47eb0bc16f5976215c
tree8fafcc789dc06e90665e6eee6388af228bbd2fd7
parent242647bcf8464860f173f3d4d4ab3490d3558518
parent815868e7b5c207ba42d5b317ccc51f8112732268
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
drivers/net/wireless/wl12xx/wl1271_cmd.h
13 files changed:
MAINTAINERS
drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-eeprom.h
drivers/net/wireless/iwlwifi/iwl-fh.h
drivers/net/wireless/prism54/isl_ioctl.c
drivers/net/wireless/rt2x00/rt2800.h
drivers/net/wireless/wl12xx/wl1271.h
drivers/net/wireless/wl12xx/wl1271_acx.h
drivers/net/wireless/wl12xx/wl1271_cmd.h
drivers/net/wireless/wl12xx/wl1271_event.h
net/mac80211/cfg.c
net/wireless/nl80211.c