Merge branch 'linus' into timers/core

Conflicts:
	Documentation/feature-removal-schedule.txt

Merge reason: Resolve the conflict, update to upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 7cbcfb0ade1c..9bd155e4111c 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -5072,7 +5072,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
         INIT_WORK(&cp->reset_task, cas_reset_task);
 
         /* Default link parameters */
-        if (link_mode >= 0 && link_mode <= 6)
+        if (link_mode >= 0 && link_mode < 6)
                 cp->link_cntl = link_modes[link_mode];
         else
                 cp->link_cntl = BMCR_ANENABLE;