Merge branch 'for-2.6.29' into for-2.6.30
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 2 Feb 2009 12:46:51 +0000 (12:46 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 2 Feb 2009 12:46:51 +0000 (12:46 +0000)
commite50a7ea0eba4f336b78b737e5ce48fba691c4919
tree1f9d4eddd1afdbb96ae2eba09238cdb55ed0f5e8
parent8f008062943c8565e855dda8a6681f641d7e71f9
parent21dff4345697ad129b0efeed1b4d0aa53dfd47fe
Merge branch 'for-2.6.29' into for-2.6.30
sound/soc/omap/omap-pcm.c