]> 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, 1 Feb 2011 17:01:27 +0000 (12:01 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 1 Feb 2011 17:01:27 +0000 (12:01 -0500)
commit23b254f78e3a21f4c1085e28493b73ec2b44302f
tree673c6ecfc34c7534503be739e0be777ee6422424
parent5ce5a3c08e3d244da2f13f20bb6ffbbb0b2dbaa7
parent66664f8efb6f7f4aae1939d20a029003845776db
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Conflicts:
drivers/net/wireless/wl12xx/spi.c
drivers/net/wireless/ath/ath9k/main.c