]> 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)
commit4f77f33c5f33005fd99c7ae481f6dc36d121d0d7
treee3765af6d4b292d8f3c013a5962324eab683a931
parent8445f3de623789cb29cc5f64cfffcdf0f5345ab5
parent33a82c71c8acd93adea515c0af38e9c1ad77b805
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