Merge branch 'for-next' into for-linus

Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index e3ddcb8f29df..2fbf15235c05 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -2096,7 +2096,7 @@ typhoon_tx_timeout(struct net_device *dev)
 
         if(typhoon_reset(tp->ioaddr, WaitNoSleep) < 0) {
                 netdev_warn(dev, "could not reset in tx timeout\n");
-                goto truely_dead;
+                goto truly_dead;
         }
 
         /* If we ever start using the Hi ring, it will need cleaning too */
@@ -2105,13 +2105,13 @@ typhoon_tx_timeout(struct net_device *dev)
 
         if(typhoon_start_runtime(tp) < 0) {
                 netdev_err(dev, "could not start runtime in tx timeout\n");
-                goto truely_dead;
+                goto truly_dead;
         }
 
         netif_wake_queue(dev);
         return;
 
-truely_dead:
+truly_dead:
         /* Reset the hardware, and turn off carrier to avoid more timeouts */
         typhoon_reset(tp->ioaddr, NoWait);
         netif_carrier_off(dev);