Merge branch 'fixes' into next
authorVinod Koul <vinod.koul@linux.intel.com>
Wed, 1 Feb 2012 17:01:14 +0000 (22:31 +0530)
committerVinod Koul <vinod.koul@linux.intel.com>
Wed, 1 Feb 2012 17:01:28 +0000 (22:31 +0530)

Trivial merge