Merge branch 'for-2.6.32' into for-2.6.33
commitd4a8da910e6db53d45ff76f7fdc584376de542df
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 5 Oct 2009 09:36:28 +0000 (5 10:36 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 5 Oct 2009 09:36:28 +0000 (5 10:36 +0100)
treef94af5b586891834401469b3e90f64c8e4a2d171
parentce3e3737a3361e0c7030f8598eec36bb82050de6
parente655a43544bd3c45a83da93b00a4b115b4fa758e
Merge branch 'for-2.6.32' into for-2.6.33
sound/soc/codecs/wm8940.c
sound/soc/soc-dapm.c