Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 10 Apr 2013 14:39:27 +0000 (10:39 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 10 Apr 2013 14:39:27 +0000 (10:39 -0400)
Conflicts:
drivers/net/wireless/rt2x00/rt2x00pci.c
net/mac80211/sta_info.c
net/wireless/core.h

1  2 
drivers/net/wireless/iwlegacy/common.c
drivers/net/wireless/iwlegacy/common.h
drivers/net/wireless/iwlwifi/pcie/tx.c
net/bluetooth/af_bluetooth.c
net/bluetooth/rfcomm/sock.c
net/bluetooth/sco.c
net/mac80211/tx.c

Simple merge
Simple merge
Simple merge
Simple merge