Merge tag 'v3.6-rc4' into asoc-omap
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 5 Sep 2012 05:04:34 +0000 (13:04 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 5 Sep 2012 05:04:34 +0000 (13:04 +0800)
Linux 3.6-rc4


Trivial merge