Merge branch 'fixes' into next
authorVinod Koul <vinod.koul@linux.intel.com>
Tue, 31 Jan 2012 08:18:53 +0000 (13:48 +0530)
committerVinod Koul <vinod.koul@linux.intel.com>
Tue, 31 Jan 2012 08:19:35 +0000 (13:49 +0530)

Trivial merge