Merge commit 'a5479e389e989acfeca9c32eeb0083d086202280' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 11 Aug 2009 12:09:27 +0000 (13:09 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 11 Aug 2009 12:09:27 +0000 (13:09 +0100)
commit1921bab217c2c21e4b8dc78332f6ae11515fc014
tree0577922c34d491b34c6a5aa47dab950c073ada12
parent17244c24f95ba61a12b6afeab5780a1e3f1a4c57
parenta5479e389e989acfeca9c32eeb0083d086202280
Merge commit 'a5479e389e989acfeca9c32eeb0083d086202280' into for-2.6.32
include/sound/soc-dai.h
sound/soc/codecs/wm9081.c