Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 13 Jan 2011 13:58:23 +0000 (13:58 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 13 Jan 2011 13:58:23 +0000 (13:58 +0000)
commit3e8e2cc45c9d6b5c1265838a8cff701815321dbc
tree708e85b74bac0427389d6f41e04522dfced1773c
parenta193436c5d52e8398af22462beaa03407fa89b2e
parent7bd1fd8a96098b84664acdca5361defaf1e6ce9f
Merge branch 'for-2.6.38' into for-2.6.39
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile
sound/soc/codecs/wm8995.c
sound/soc/samsung/rx1950_uda1380.c
sound/soc/soc-cache.c