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

Hi Dave,

quoted

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?

they are coding style fixes to bring net/6lowpan/ in sync with net subsystem coding style. That code is still a bit outdated. I took a first stab at fixing the obvious mistakes.

Regards

Marcel