Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

2 files changed, 3 insertions, 3 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)
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index 27cf4af0e13d..e5ab62141503 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -132,7 +132,7 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
  *      Removes a previously added pointer from the context list and returns
  *      the matching context id.
  *
- *      Returns context id on succes or 0 on failure.
+ *      Returns context id on success or 0 on failure.
  */
 u32 i2o_cntxt_list_remove(struct i2o_controller * c, void *ptr)
 {
@@ -198,7 +198,7 @@ void *i2o_cntxt_list_get(struct i2o_controller *c, u32 context)
  *      @c: controller to which the context list belong
  *      @ptr: pointer to which the context id should be fetched
  *
- *      Returns context id which matches to the pointer on succes or 0 on
+ *      Returns context id which matches to the pointer on success or 0 on
  *      failure.
  */
 u32 i2o_cntxt_list_get_ptr(struct i2o_controller * c, void *ptr)