]> 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)
commitbd62f5af58cf19a1054bb68b439bd43ea0e2ac34
tree5d88b1619176b860041fdd20b64ce917b8613698
parentd3aa45bd6a929f71c2773be32d3e66a80c31f2ef
parenteb684420c522b27f9b7e75ea8ff3185cb90f7d2f
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