]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'wl12xx-next' into for-linville
authorLuciano Coelho <coelho@ti.com>
Fri, 18 Jan 2013 07:40:07 +0000 (09:40 +0200)
committerLuciano Coelho <coelho@ti.com>
Fri, 18 Jan 2013 07:59:08 +0000 (09:59 +0200)
commit790966e7c27f582b0dff5382265a4f69f1c6161c
tree5d88b1619176b860041fdd20b64ce917b8613698
parent2c2ca60390081c3b1d9f59f0c749d2e400faf024
parent77e0343293f39f64a3e03edcb326d7828711bc65
Merge branch 'wl12xx-next' into for-linville

Conflicts:
drivers/net/wireless/ti/wl12xx/main.c
drivers/net/wireless/ti/wlcore/wlcore.h
drivers/net/wireless/ti/wl12xx/main.c
drivers/net/wireless/ti/wl18xx/main.c
drivers/net/wireless/ti/wlcore/cmd.c
drivers/net/wireless/ti/wlcore/main.c
drivers/net/wireless/ti/wlcore/sdio.c
drivers/net/wireless/ti/wlcore/spi.c
drivers/net/wireless/ti/wlcore/wlcore.h