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/net/caif/caif_spi.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/net/caif/caif_spi.c')
| -rw-r--r-- | drivers/net/caif/caif_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c index 20da1996d354..57e639373815 100644 --- a/drivers/net/caif/caif_spi.c +++ b/drivers/net/caif/caif_spi.c | |||
| @@ -397,7 +397,7 @@ int cfspi_xmitlen(struct cfspi *cfspi) | |||
| 397 | int pkts = 0; | 397 | int pkts = 0; |
| 398 | 398 | ||
| 399 | /* | 399 | /* |
| 400 | * Decommit previously commited frames. | 400 | * Decommit previously committed frames. |
| 401 | * skb_queue_splice_tail(&cfspi->chead,&cfspi->qhead) | 401 | * skb_queue_splice_tail(&cfspi->chead,&cfspi->qhead) |
| 402 | */ | 402 | */ |
| 403 | while (skb_peek(&cfspi->chead)) { | 403 | while (skb_peek(&cfspi->chead)) { |