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 /kernel/irq/migration.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 'kernel/irq/migration.c')
| -rw-r--r-- | kernel/irq/migration.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c index bc6194698dfd..47420908fba0 100644 --- a/kernel/irq/migration.c +++ b/kernel/irq/migration.c | |||
| @@ -35,7 +35,7 @@ void irq_move_masked_irq(struct irq_data *idata) | |||
| 35 | * do the disable, re-program, enable sequence. | 35 | * do the disable, re-program, enable sequence. |
| 36 | * This is *not* particularly important for level triggered | 36 | * This is *not* particularly important for level triggered |
| 37 | * but in a edge trigger case, we might be setting rte | 37 | * but in a edge trigger case, we might be setting rte |
| 38 | * when an active trigger is comming in. This could | 38 | * when an active trigger is coming in. This could |
| 39 | * cause some ioapics to mal-function. | 39 | * cause some ioapics to mal-function. |
| 40 | * Being paranoid i guess! | 40 | * Being paranoid i guess! |
| 41 | * | 41 | * |