Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 22 Feb 2011 18:38:13 +0000 (10:38 -0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 22 Feb 2011 18:38:13 +0000 (10:38 -0800)
commit4c090edfbbe3f8e63ec9fb7abaab17e0191646a1
treef90c28b485d7b43c4162e834c6f1b5b7bd6ae294
parent4baafdd76bafc51699a924d2bc1317f50b4ea75f
parentcea2bc50a3dd88e43be2e926a9ae31ab7816bf2d
Merge branch 'for-2.6.38' into for-2.6.39
sound/soc/codecs/wm8903.h
sound/soc/codecs/wm8994.c