Merge branch 'for-greg' of git://gitorious.org/usb/usb into usb-linus
[pandora-kernel.git] / drivers / net / wireless / ath / carl9170 / rx.c
index 84866a4..ec21ea9 100644 (file)
@@ -849,7 +849,7 @@ static void carl9170_rx_stream(struct ar9170 *ar, void *buf, unsigned int len)
                                /*
                                 * nested carl9170_rx_stream call!
                                 *
-                                * termination is guranteed, even when the
+                                * termination is guaranteed, even when the
                                 * combined frame also have an element with
                                 * a bad tag.
                                 */