]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit7e6b83f7468f76b8e82a46eb69a57c6713302a66
tree1d43a5e0129709502edb631a4fd66de369ee5620
parent8407daf58a6783e2d9a9340ebb76361c364aa003
parent61d20a65d994c6b5029e30752ccbdb65765488aa
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/rt2x00/rt2x00pci.c
net/mac80211/sta_info.c
net/wireless/core.h
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