Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream

Conflicts:

	drivers/net/wireless/zd1211rw/zd_mac.h
	net/ieee80211/softmac/ieee80211softmac_assoc.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 1bcd352a813b..dd9ba4aad7bb 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -6220,7 +6220,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
         /* Allocate and initialize the Tx/Rx queues and lists */
         if (ipw2100_queues_allocate(priv)) {
                 printk(KERN_WARNING DRV_NAME
-                       "Error calilng ipw2100_queues_allocate.\n");
+                       "Error calling ipw2100_queues_allocate.\n");
                 err = -ENOMEM;
                 goto fail;
         }