diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/media/rc/ir-raw.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/media/rc/ir-raw.c')
| -rw-r--r-- | drivers/media/rc/ir-raw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c index 01f258a2a57a..11c19d8d0ee0 100644 --- a/drivers/media/rc/ir-raw.c +++ b/drivers/media/rc/ir-raw.c | |||
| @@ -153,7 +153,7 @@ EXPORT_SYMBOL_GPL(ir_raw_event_store_edge); | |||
| 153 | * @type: the type of the event that has occurred | 153 | * @type: the type of the event that has occurred |
| 154 | * | 154 | * |
| 155 | * This routine (which may be called from an interrupt context) works | 155 | * This routine (which may be called from an interrupt context) works |
| 156 | * in similiar manner to ir_raw_event_store_edge. | 156 | * in similar manner to ir_raw_event_store_edge. |
| 157 | * This routine is intended for devices with limited internal buffer | 157 | * This routine is intended for devices with limited internal buffer |
| 158 | * It automerges samples of same type, and handles timeouts | 158 | * It automerges samples of same type, and handles timeouts |
| 159 | */ | 159 | */ |