Merge branch 'for-2.6.38' into for-2.6.39

diff --cc sound/soc/codecs/Kconfig
Simple merge

diff --cc sound/soc/codecs/Makefile
Simple merge

diff --cc sound/soc/codecs/wm8995.c
Simple merge

diff --cc sound/soc/samsung/rx1950_uda1380.c
Simple merge

diff --cc sound/soc/soc-cache.c
Simple merge