Merge branch 'for-2.6.29' into for-2.6.30
Mark Brown [Fri, 23 Jan 2009 15:02:08 +0000 (15:02 +0000)]
1  2 
include/sound/soc-dapm.h

Simple merge