]> 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, 5 Jan 2011 21:06:25 +0000 (16:06 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 5 Jan 2011 21:06:25 +0000 (16:06 -0500)
commitbd0eab3fa326e474a5f7b14284544ba54663db3f
tree751bec601fb8152116b8e31e0f1f83d687a37d6f
parent2a75cfe5bda48cff10b7875a9b6e1a03adff4e77
parentc1e482f689b43093a784b07c836a4b781c920812
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
net/bluetooth/Makefile
MAINTAINERS
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
net/mac80211/ieee80211_i.h
net/mac80211/main.c
net/mac80211/rx.c
net/mac80211/tx.c