Merge branch 'for-2.6.34' into for-2.6.35

Conflicts due to context changes next to the backported DMA data change:
	include/sound/soc.h

1 files changed, 1 insertions, 1 deletions

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 80dfac162723..4ab3dad4a9c9 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -381,7 +381,7 @@ struct snd_soc_pcm_stream {
         unsigned int rate_max;          /* max rate */
         unsigned int channels_min;      /* min channels */
         unsigned int channels_max;      /* max channels */
-        unsigned int active;            /* num of active users of the stream */
+        unsigned int active;            /* stream is in use */
         void *dma_data;                 /* used by platform code */
 };