]> 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>
Mon, 31 Jan 2011 20:24:31 +0000 (15:24 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 31 Jan 2011 20:24:31 +0000 (15:24 -0500)
commitabab82d100660a56fe2890d1e08af3ffbdec45e6
tree673c6ecfc34c7534503be739e0be777ee6422424
parent5ce5a3c08e3d244da2f13f20bb6ffbbb0b2dbaa7
parent1dd8e43637d1e1b7b605155fe06e955dbead73d6
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