Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 3 Feb 2011 20:17:54 +0000 (20:17 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 3 Feb 2011 20:17:54 +0000 (20:17 +0000)
commit7d7a7e043872d2ebf91e90fd4ce5845179cf5b00
tree03bd6a361da32185d207fd22aaa442630dcbc4cf
parentc45bfccfa299a9b3a20373963c286b4e9bd3c40f
parent6ed8f1485fc82d44ac464bc84a7dcdddd1fa096f
Merge branch 'for-2.6.38' into for-2.6.39
sound/soc/codecs/wm8994.c