Merge branch 'for-2.6.36' into for-2.6.37
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 19 Sep 2010 15:03:16 +0000 (16:03 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 19 Sep 2010 15:03:16 +0000 (16:03 +0100)
1  2 
sound/soc/sh/migor.c

Simple merge