]> 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)
commit25bfa97876f909a51bf3b419e57f77c1952ed715
treeeaa79e1106c91057fcabb7b7000e7ec35ab5b121
parentaf7ff42253b857f8056cdcf1fcff2cfd4795057c
parent3aedd90e99bf79e54352ed19352b7d17ad37834c
Merge branch 'wl12xx-next' into for-linville

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