Merge branch 'fixes' into next
authorVinod Koul <vinod.koul@linux.intel.com>
Thu, 14 Jun 2012 05:50:31 +0000 (11:20 +0530)
committerVinod Koul <vinod.koul@linux.intel.com>
Thu, 14 Jun 2012 05:50:31 +0000 (11:20 +0530)

Trivial merge