Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 27 Jul 2010 15:59:19 +0000 (11:59 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 27 Jul 2010 15:59:19 +0000 (11:59 -0400)
commit800f65bba8d2030b3fef62850e203f9f176625a8
tree6507c4fe7a0826c253b4afb29375ab306a0fd9c8
parent06b3cda0c12986f5bba578b918b188d731c4e191
parentb3190df628617c7a4f188a9465aeabe1f5761933
Merge branch 'master' of git://git./linux/kernel/git/holtmann/bluetooth-next-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-commands.h
16 files changed:
MAINTAINERS
drivers/net/wireless/airo.c
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/ipw2x00/libipw.h
drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-eeprom.h
drivers/net/wireless/libertas/host.h
drivers/net/wireless/mwl8k.c
drivers/net/wireless/orinoco/orinoco_usb.c
drivers/net/wireless/rtl818x/rtl818x.h
drivers/net/wireless/wl12xx/wl1251_cmd.h
drivers/net/wireless/wl12xx/wl1251_tx.h
include/net/cfg80211.h
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h