]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'wl12xx-next' into for-linville
authorLuciano Coelho <coelho@ti.com>
Tue, 4 Dec 2012 14:39:47 +0000 (16:39 +0200)
committerLuciano Coelho <coelho@ti.com>
Tue, 4 Dec 2012 14:39:47 +0000 (16:39 +0200)
commit8d3b9b65a0db3caae7d29d74bdc852be5e021bf3
tree7ccc6cf829a93d46daf484164a5466c91eca2efa
parent322098b6bbb77788a1e8eddaac73607430251102
parentf68716642abab8b87d158cf40680760400f49e25
Merge branch 'wl12xx-next' into for-linville

Conflicts:
drivers/net/wireless/ti/wlcore/main.c
drivers/net/wireless/ti/wlcore/main.c