Merge branch 'topic/asoc' of...

Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.38

sound/soc/soc-dapm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ static void pop_dbg(struct device dev, u32 pop_time, const char fmt, ...)

		va_start(args, fmt);
		vsnprintf(buf, PAGE_SIZE, fmt, args);
		dev_info(dev, buf);
		dev_info(dev, "%s", buf);
		va_end(args);

		kfree(buf);