Merge branch 'fixes' into next
authorVinod Koul <vinod.koul@linux.intel.com>
Tue, 15 May 2012 03:14:54 +0000 (08:44 +0530)
committerVinod Koul <vinod.koul@linux.intel.com>
Tue, 15 May 2012 03:14:54 +0000 (08:44 +0530)

Trivial merge