Re: pull request: wireless-next 2014-08-01

From: "John W. Linville" <redacted>
Date: Fri, 1 Aug 2014 12:57:38 -0400

Please pull this last(?) batch of wireless change intended for the
3.17 stream...

When I pull this I get tons of conflicts for:

CONFLICT (content): Merge conflict in net/6lowpan/iphc.c

I don't feel comfortable fixing these up, where are they coming
from?