]> 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>
Fri, 21 Jun 2013 19:42:30 +0000 (15:42 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 21 Jun 2013 19:42:30 +0000 (15:42 -0400)
commit3b576267502c94c950eba99b7fa271d662fdc2fe
treee3765af6d4b292d8f3c013a5962324eab683a931
parent49893123657af27845db136dcf0c31f0fef6b130
parent5989a1d929cc852a3135e492ad0143b926a6caee
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
net/wireless/nl80211.c
drivers/net/wireless/iwlegacy/3945-mac.c
drivers/net/wireless/iwlegacy/4965-mac.c
net/wireless/core.c
net/wireless/nl80211.c