Merge branch 'fixes' into next
authorVinod Koul <vinod.koul@linux.intel.com>
Fri, 11 May 2012 06:24:34 +0000 (11:54 +0530)
committerVinod Koul <vinod.koul@linux.intel.com>
Fri, 11 May 2012 06:24:34 +0000 (11:54 +0530)

Trivial merge