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)
commit5b37649bbcfc14c1ecfb76c5b018dd686924b946
tree5d88b1619176b860041fdd20b64ce917b8613698
parent660b9caaad380758c756a7e60397e33dab44fe3f
parent2e07d02828759a506b5205b2cff40daa58df5bf7
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