]> 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>
Tue, 15 Mar 2011 18:16:48 +0000 (14:16 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 15 Mar 2011 18:16:48 +0000 (14:16 -0400)
commit0677b2465bd1e1e2d80b2c83d6189a9710dbeb13
treeb9d13cc35cfdc3b763408287b4e50daf32fda53b
parentf7e64ad581f7e0b08f4536ff7966da0b9dffc80a
parentea0a3b61e15070d2f993a6560e37af8bec40206d
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
drivers/net/wireless/ath/ath9k/mac.c
drivers/net/wireless/iwlwifi/iwl-agn.c