Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index d505b68cd372..e39986a78273 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -940,7 +940,7 @@ static const struct block_device_operations i2o_block_fops = {
  *      Allocate memory for the i2o_block_device struct, gendisk and request
  *      queue and initialize them as far as no additional information is needed.
  *
- *      Returns a pointer to the allocated I2O Block device on succes or a
+ *      Returns a pointer to the allocated I2O Block device on success or a
  *      negative error code on failure.
  */
 static struct i2o_block_device *i2o_block_device_alloc(void)