Merge branch 'topic/for-asoc'
authorSamuel Ortiz <sameo@linux.intel.com>
Mon, 2 Sep 2013 08:31:08 +0000 (10:31 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Mon, 2 Sep 2013 08:31:08 +0000 (10:31 +0200)

Trivial merge