Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  typo fixes
  Clean up 'inline is not at beginning' warnings for usb storage
  Storage class should be first
  i386: Trivial typo fixes
  ixj: make ixj_set_tone_off() static
  spelling fixes
  fix paniced->panicked typos
  Spelling fixes for Documentation/atomic_ops.txt
  move acknowledgment for Mark Adler to CREDITS
  remove the bouncing email address of David Campbell

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 72335c8eb97f..94aeb23a7729 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -1485,7 +1485,7 @@ static int ipw2100_hw_stop_adapter(struct ipw2100_priv *priv)
                  *
                  * Sending the PREPARE_FOR_POWER_DOWN will restrict the
                  * hardware from going into standby mode and will transition
-                 * out of D0-standy if it is already in that state.
+                 * out of D0-standby if it is already in that state.
                  *
                  * STATUS_PREPARE_POWER_DOWN_COMPLETE will be sent by the
                  * driver upon completion.  Once received, the driver can