Merge tag 'wimax-staging' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd...

Arnd writes:

wimax: move to staging

After I sent a fix for what appeared to be a harmless warning in
the wimax user interface code, the conclusion was that the whole
thing has most likely not been used in a very long time, and the
user interface possibly been broken since b61a5eea5904 ("wimax: use
genl_register_family_with_ops()").

Using a shared branch between net-next and staging should help
coordinate patches getting submitted against it.

* tag 'wimax-staging' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground:
  wimax: move out to staging
  wimax: fix duplicate initializer warning

diff --cc MAINTAINERS
Simple merge