Merge rsync://bughost.org/repos/ipw-delta/

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/wireless/ipw2100.c
index 4f19ac7d63a8ed4273eb3cdb01bfa8955c1d40ac,76841cb8301b764a267526ec081d8c95d8df85ac..877ac514aa07f8c643bf53b6ab03fe27e3b49e81
--- 1/drivers/net/wireless/ipw2100.c
--- 2/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@@ -6070,9 -6064,11 +6063,10 @@@ static int ipw2100_wpa_set_encryption(s
                        ret = -ENOMEM;
                        goto done;
                }
 -              memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
                new_crypt->ops = ops;
                if (new_crypt->ops && try_module_get(new_crypt->ops->owner))
-                       new_crypt->priv = new_crypt->ops->init(param->u.crypt.idx);
+                       new_crypt->priv =
+                           new_crypt->ops->init(param->u.crypt.idx);
  
                if (new_crypt->priv == NULL) {
                        kfree(new_crypt);