On Thu, 2013-10-03 at 12:07 +0200, Sedat Dilek wrote:

quoted

I believe the merge damage only occurred during merging wireless.git (or
one of its upstreams) into wireless-next.git.

Hmm, this patch applies also for Linux v3.12-rc3+, so you are sure it
is not for iwlwifi-3.12-fixes?

Ahrg, yes, so it happened in wireless-next *before* wireless-next went
into 3.12-rc1.

John, any idea what to do now? Cherry-pick the patch over to
wireless.git?

johannes