From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 26 Sep 2012 03:13:35 +0000 (+1000)
Subject: Merge remote-tracking branch 'trivial/for-next'
X-Git-Tag: next-20120926~41
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=95ac84caa9d2c2a95552c09ab938f02711adbacd;p=karo-tx-linux.git

Merge remote-tracking branch 'trivial/for-next'

Conflicts:
	drivers/scsi/ipr.c
	drivers/video/backlight/88pm860x_bl.c
---

95ac84caa9d2c2a95552c09ab938f02711adbacd
diff --cc drivers/dma/ep93xx_dma.c
index 493735b9b2c9,bb02fd981afb..8948e8ccefb6
--- a/drivers/dma/ep93xx_dma.c
+++ b/drivers/dma/ep93xx_dma.c
@@@ -1118,9 -1118,8 +1118,9 @@@ fail
   * @chan: channel
   * @dma_addr: DMA mapped address of the buffer
   * @buf_len: length of the buffer (in bytes)
-  * @period_len: lenght of a single period
+  * @period_len: length of a single period
   * @dir: direction of the operation
 + * @flags: tx descriptor status flags
   * @context: operation context (ignored)
   *
   * Prepares a descriptor for cyclic DMA operation. This means that once the