]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorLuciano Coelho <coelho@ti.com>
Thu, 1 Dec 2011 10:14:48 +0000 (12:14 +0200)
committerLuciano Coelho <coelho@ti.com>
Thu, 1 Dec 2011 10:14:48 +0000 (12:14 +0200)
commit9e943a333999ee0438e5fea8a69786ffa2539879
treef69f424f731b89a75f881967903ff2f38f4b6a92
parentaa7b00dcfca11de4f2912f3f3b4cfc461e3fe9d6
parentbf04696dd6c6c40e86637818c3b4ca9f4d02a834
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next
drivers/net/wireless/wl12xx/boot.c
drivers/net/wireless/wl12xx/scan.c
drivers/net/wireless/wl12xx/spi.c