diff --git a/[refs] b/[refs] index 49ca27e3b3ec..70d0a3b1507c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 654e02200578799264941e5a9b533563a87f8579 +refs/heads/master: 8453d43f0ee08ac6c20f390797772a08f81f999a diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c index 2d826fff7e2e..fa29a403a247 100644 --- a/trunk/drivers/net/s2io.c +++ b/trunk/drivers/net/s2io.c @@ -8036,7 +8036,7 @@ static void lro_append_pkt(struct s2io_nic *sp, struct lro *lro, /** * s2io_io_error_detected - called when PCI error is detected * @pdev: Pointer to PCI device - * @state: The current pci conneection state + * @state: The current pci connection state * * This function is called after a PCI bus error affecting * this device has been detected.