]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'wl12xx-next' into for-linville
authorLuciano Coelho <coelho@ti.com>
Thu, 21 Jun 2012 14:31:46 +0000 (17:31 +0300)
committerLuciano Coelho <coelho@ti.com>
Thu, 21 Jun 2012 14:31:46 +0000 (17:31 +0300)
commit3dfb1c62f14db9b2466483e1fc5c2feb9db479f4
treeeaa79e1106c91057fcabb7b7000e7ec35ab5b121
parent8d8e5c2fda720e1666b4ab9a4c38a369a3f9a61e
parent074e82276e2b7659d1c8315cf64cf8770f794958
Merge branch 'wl12xx-next' into for-linville

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