Merge branch 'omap-for-v3.8/cleanup-headers-asoc' into omap-for-v3.8/cleanup-headers
authorTony Lindgren <tony@atomide.com>
Thu, 18 Oct 2012 22:56:57 +0000 (15:56 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 18 Oct 2012 22:56:57 +0000 (15:56 -0700)

Trivial merge