From: Luciano Coelho Date: Tue, 26 Jun 2012 19:43:29 +0000 (+0300) Subject: Merge branch 'wl12xx-next' into for-linville X-Git-Tag: next-20120724~65^2~52^2~229 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=a572ac1a3d37440dc9daf69f9ad63243bef6893f;p=karo-tx-linux.git Merge branch 'wl12xx-next' into for-linville --- a572ac1a3d37440dc9daf69f9ad63243bef6893f