Merge branch 'fixes' into next
authorVinod Koul <vinod.koul@linux.intel.com>
Wed, 25 Apr 2012 09:58:54 +0000 (15:28 +0530)
committerVinod Koul <vinod.koul@linux.intel.com>
Wed, 25 Apr 2012 09:58:54 +0000 (15:28 +0530)

Trivial merge